cache now invalidated
resolved conflict