undo tentative merge