modify merge.py