reducing thumbnail size
adding new images
fixing merge conflict