after merge conflict