added images
merged conflicts