Resolved callback issue with videos
Resolved merge conflict