Fixed edit video
Merge remote-tracking branch 'upstream/master'
Minor fix
Conflict managed
Merge Commit