undo wrong merge