changed image
fix merge conflict