resolved merge conflict for #video css