User can add video
merge conflict