Able to play some video in app
Fix merge error