modify merge