modify merge_changes