Undoing merge errors