Correction of merge errors