changes in gallery
removed conflicts