It seems to me that the ClientStorage class would need to be modified to support conflict resolution. Are there plans to do this? In fact, are there any plans for a new ZEO release in tandem with Zope 2.3? --amk