add the image
resolved conflicts