Undo wrong merge resolution.