modify merge problem