VID-1854-gallery fix cruft from merge conflict