edit and remove productimages
merge fix