After resolving a merge conflicts I haved added files to the staging area. Then I have accidentally executed a commit command with the amend option:
git commi