Correct the conflicts during the merge