change merge.py