update image
fix conflicts