8 x 8 images
conflicts resolved