Although my hook (_p_resolveConflicts) is called and is returning the proper state, the transactions are still being retried :( Does the default FileStorage in Zope 2.4.0 support conflict resolution or not? If not, are there any production quality stable storages for use with Zope that do? Thanks, -Randy