update images
fix merge