fix video conflicts