fixed conflicted run.py