changed merge conflict