fix video
botched up rebase