adding image
adding images and fixed conflict