fatal: You have not concluded your merge. (MERGE_HEAD exists)

へんなpullしてしまった

解決

 git reset --merge