working on play button
merge error fix