fixed everything playing at the same time bug
merging