perk /submit — your PR has merge conflicts against `{{ base }}`; resolve them before the work is submitted for review. This is attempt {{ attempt }} of {{ cap }}.
1. Spawn the `perk.conflict-resolver` agent via the `subagent` tool with `context: "fresh"`{% if model %}, and pass `model: "{{ model }}"` on that call (the configured [models.subagents] conflict-resolver model){% else %} (no model override — the agent's default model is used){% endif %}. A fresh context keeps this implementation session's history from biasing the resolution.
2. Tell it: rebase the PR branch onto `{{ base }}` and **carefully** resolve all merge conflicts so the resulting diff is **clean** (no stray markers, no unrelated churn) and **correct** (preserve the change's intent on both sides). The child reads its own plan + PR diff context first (it runs `perk pr review-context`) so it resolves with the change's intent in hand, verifies, and force-pushes — the raw diff never enters this session.
3. After the child reports success, call `/submit` again to re-verify mergeability. Do NOT edit or resolve conflicts yourself here — the child owns the rebase/resolve/push.