after merge conflict resolve