Could someone confirm for me if conflict resolution occurs on the ZEO server or the client ? I'd guess the server. It means that if I have a class that does special conflict resolution, it needs to be present on the server, right ? Thanks, Florent -- Florent Guillaume, Nuxeo (Paris, France) +33 1 40 33 79 87 http://nuxeo.com mailto:fg at nuxeo.com