modify merge conflict