make sure of image types
fixed conflicts