All tagged values-aligned conflict resolution