add images and code for images
resolve merge conflict