Undo last commit, merge messed up