Changed lines in merge.py