Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
npx skills add Dankosik/go-service-template-rest --skill merge-conflict-resolutiongit clone --depth 1 https://github.com/Dankosik/go-service-template-restWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/skills/dankosik/go-service-template-rest/merge-conflict-resolution)<a href="https://agentmods.dev/skills/dankosik/go-service-template-rest/merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/dankosik/go-service-template-rest/merge-conflict-resolution/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/dankosik/go-service-template-rest/merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/dankosik/go-service-template-rest/merge-conflict-resolution.svg" alt="Reviewed on agentmods" width="80" height="20"></a>What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00042 | $0.00272 |
| Opus 5 | $0.00021 | $0.00136 |
| Sonnet 5 | $0.00008 | $0.00054 |
| Haiku 4.5 | $0.00004 | $0.00027 |
Grade A, and why
merge-conflict-resolution scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 12d ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
What it actually says
Merge Conflict Resolution
Inspect git status, the active operation, its base and sides, every conflicted
path, and unrelated work before editing. For each hunk, trace both sides to
their closest authority: accepted spec or task, canonical generated source,
commit and PR, current callers, and tests. State both intents before resolving.
Under read-only authorization, stop after reconstructing both intents and return the hunk dispositions, proof plan, and exact blocker without editing, staging, or continuing the operation.
Preserve compatible intents. When they conflict, follow the accepted outcome and current source of truth; never invent behavior merely to remove markers or select one whole side without hunk-level evidence. If authority cannot choose, leave the operation intact and return the exact decision blocker.
Inspect the resolved diff from the operation base, run the smallest affected proof, stage only resolved paths, and continue the already-authorized operation. Return the operation and base, intent sources, hunk dispositions, proof, and any unresolved blocker.
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 12d ago First seen · 29 lines · 42 tokens per session scan A c7e198423be0
merge-conflict-resolution is a skill published in the GitHub repository Dankosik/go-service-template-rest (7 stars, last pushed 3d ago), licensed MIT. It adds 42 tokens to every session and 272 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.
Other skills, from other repositories
commit-generate
Generate bilingual (English + Traditional Chinese) commit message from git changes.
version-generate
A release-note generator that reads changes from the latest Git tag to the current code and recommends a new semantic version. It writes versioned notes and updates a main changelog index.
pi-loop-forensics
Diagnose pi-go agent loops and degenerate turns — "agent loop aborted", runaway thinking with no tool calls, repeated phrases. Discriminates genuine model repetition collapse from a race, a tool-parse failure, or a too-low guard, and A/B replays a seed session across providers.
nightly-session-watch
Nightly sweep of the last 24h of pi-go sessions — anomalous runs, loop aborts, tool error rates, token waste, real prompt-token spend, and whether the observation and palace pipelines are still recording. Triages each finding to the specialist skill that diagnoses it. Use for an unattended daily health check, or on…
vhs-e2e-gif
Record a test run, a TUI session, or any terminal command as a GIF with VHS and attach it to a GitHub PR as a release-hosted asset, never a repo commit. Use when asked to record an e2e run, demo a fix on a PR, attach a GIF or screen recording to a pull request, show a test passing visually, or produce a terminal…
config-loader-helper
Diagnose configuration-related failures, enumerate required env vars, and guide safe local test setup (no secrets).