removing unncessary images
merged conflicts