merge conflict resolve