Minor updates in video
Fixed conflict