You have not concluded your merge (MERGE_HEAD exists).

The problem is your previous pull failed to merge automatically and went to conflict state.
And the conflict wasn't resolved properly before the next pull.

1) Undo the merge and pull again.

To undo a merge:

git merge --abort [Since git version 1.7.4]

git reset --merge [prior git versions]

2) pull again

3) Merge again

2) Resolve the conflict properly

3) Don't forget to add and commit the merge.

4) git pull now everything should work fine.


This should fix your problem.