image changes
fix merge