Fix conflict for camera feed