conflict resolution support with add-only Set test