Pulling from upstream fails

gistfile1.txt

jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git checkout master
Switched to branch 'master'
jyrki@Jyrki:/mnt/data/Avoin Ministerio/avoinministerio$ git pull avoinministerio master
From github.com:avoinministerio/avoinministerio
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Facebook login progess started. Not working yet.
Using index info to reconstruct a base tree...
<stdin>:131: trailing whitespace.
  
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging config/routes.rb
Auto-merging config/initializers/devise.rb
CONFLICT (content): Merge conflict in config/initializers/devise.rb
Auto-merging app/views/pages/home.html.haml
CONFLICT (content): Merge conflict in app/views/pages/home.html.haml
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Failed to merge in the changes.
Patch failed at 0001 Facebook login progess started. Not working yet.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".