change playing file
fix merge conflict