Master PR #263 (scoped-layers-store): one conflict in the regenerated docs/architecture.i18n.yaml pairing record — took master's and re-recorded the pair over both sides' merged architecture.md/zh.md (the ctx.modes rows merged cleanly on both).