finish modify play.py
fix merge