resolve merge conflict
lectures(videos) upload functionality