Merge correcting