Merge conflict resolve