change playing file
fixed merge conflict