Correction of failed merge