some images
tried to resolve conflicts