It looks like you checked in the merge conflicts.  You might have made the changes locally, but forgotten to `git add` them?