Resolve conflicts as unions preserving both sides:
- blocks/registry.ts: keep this branch's BlockMeta imports/registry and add
staging's new EnrichmentBlock and RB2BBlock.
- ee/access-control: take staging's ProviderRow (per-model denylist feature).
Make the merged catalog consistent with this branch's BlockMeta model:
- Add EnrichmentBlockMeta + RB2BBlockMeta (valid tags + >=7 catalog templates
each), register them, and drop the new blocks' config-level `tags`.
- Regenerate integrations.json + docs canonically: enrichment now has a catalog
entry and rb2b uses the singular integrationType (no stale plural).
Emir Karabeg
6a1af1680e