undo a git merge the easy way and then undo the undoing!