add video uploader
resolve conflict