[Sprint 19] Resolve release PR #352 conflicts into dev

[mpaulosky]

Summary

• Merge the already-validated conflict-resolution branch sprint/19-release-pr352-conflicts into dev.
• Unblock release PR [RELEASE] Sprint 19 — Polish, Markdown Editor & Categories #352 (dev -> main) after conflict resolution.

Done when

• Conflict-fix PR into dev is merged
• Release PR [RELEASE] Sprint 19 — Polish, Markdown Editor & Categories #352 is re-checked
• Release PR [RELEASE] Sprint 19 — Polish, Markdown Editor & Categories #352 is merged, or the remaining blocker is documented

[github-actions]

📋 Assigned to Aragorn (Lead / Architect)

Issue: #353 — [Sprint 19] Resolve release PR #352 conflicts into dev

Aragorn will pick this up in the next Copilot session.

For Copilot coding agent: If enabled, this issue will be worked automatically.
Otherwise, start a Copilot session and say:
Aragorn, work on issue #353