Back to the previous verion of merge.py