added images
fixed conflict