fixing play button
merge