fixed megavideo directives
resolved merge conflicts