Git merge error status

Mark Seymour@AVALON /g/bot (master|MERGING)
$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 3 different commit(s) each, respectively.
#
# Changes to be committed:
#
#       modified:   README.md
#       modified:   lib/plugins/authtest.rb
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      lib/plugins/adminhandler.rb