Merge the conflict