git merge 冲突，提示You have not concluded your merge (MERGE_HEAD exists)

You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.

可以先撤销合并

git merge --abort [Since git version 1.7.4]

git reset --merge [prior git versions]