Fixed some more merge problems in run.py