merge
play click bug fixed