edit images
Fixed merge.