fix merge.py