[Zope] states in _p_resolveConflicts