merge.py changed to executable