Merge conflict resolves