Fixing merge errors(?) and added array of image types