img deleted
conflict resolved