Merge conflict correction