fixed bug on youtube videos
Fixing merge conflicts