undo git merge vergissing