correct failed merge conflict resolutions