You can abort the merge using the flag `--abort` If you don't want a commit:
commit
git merge --abort