images were updated
conflict with images solved
images deleted