HEAD >>>>>>>>>>
looks like a merge marker. Most likely, there was a merge conflict, and you committed the result without resolving the merge.
The easiest way to resolve merge conflicts is to use git mergetool
. See http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging