feat(gastown): add pr_conflict_context to PrimeContext and consolidate conflict+feedback into single agent dispatch#2477

kilo-code-bot[bot] merged 2 commits intoconvoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/headKilo-Org/cloud:convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/headfrom

convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/gt/toast/19ce582fKilo-Org/cloud:convoy/feat-auto-resolve-merge-conflicts-on-prs/144e79d7/gt/toast/19ce582fCopy head branch name to clipboard