Video: fix conflict