Worked on images
Fixed merge errors