chore: resolve merge conflict markers in convention pack files

[sonupreetam]

Problem

Multiple convention pack files on main contain unresolved merge conflict markers (<<<<<<< Updated upstream / >>>>>>> Stashed changes):

• .opencode/uf/packs/severity.md:4-8
• Other pack files likely affected

These don't break the build (packs are read by agents, not compiled) but they corrupt the convention pack content that agents consume during reviews.

Fix

Resolve the conflict markers by choosing the correct version (likely the scaffolded-by comment line).

Context

Identified during review council run on 2026-08-10. Pre-existing on main, not introduced by any PR.