problem with merge

[zyhazz]

Hello,
when I try to commit when merging, I get a success, but then all push/pull fail and when I do git status on the project folder this comes:
On branch master Your branch and 'origin/master' have diverged, and have 2 and 1 different commit each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. (use "git commit" to conclude merge)
if i try to pull:
error: You have not concluded your merge (MERGE_HEAD exists). hint: Please, commit your changes before merging. fatal: Exiting because of unfinished merge.
to fix I have to manually git push origin master on the folder. how do I fix it?
thanks