Video Conflict Fix

Fixed some additional conflicts in videos.php