added images
resolved conflict