Added gallery
Fixed merge