Re: [infinispan-dev] conflicts resolution in DeltaAware