update responsive video
fix merge conflicts