Fixed some merge conflicts. Fixed the image for the cutout