Undo merge oopsie