conflict resolved for ImageDef