compressing all images
resolving weird merge conflict