git-merge

$ git pull 
M       .gitignore
M       .rvmrc
U       Gemfile
M       Gemfile.lock
A       app/controllers/adm/backers_controller.rb
D       app/models/backer_total.rb
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.