image and video added
merge