fix override list and add merge of images