images fetched
conflict resolved