Added video and command line
update conflicts