video-video conflicts are now properly handled;