Merge conflict resolutions