Did a manual Merge..

had to do a manual merge.. videos are working and the video button name
is changing...