More merge conflict resolutions