gallery images
fixed conflicts