Fix mistaken auto merge conflict resolutions.