This looks to be evidence of not fixing a merge conflict properly. The git book has [a good section](http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts) on this.