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 michael-denyer/pstack-claude --skill fix-merge-conflictsgit clone --depth 1 https://github.com/michael-denyer/pstack-claudeWrote 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/michael-denyer/pstack-claude/fix-merge-conflicts)<a href="https://agentmods.dev/skills/michael-denyer/pstack-claude/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/michael-denyer/pstack-claude/fix-merge-conflicts.svg" alt="Measured on agentmods" 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.00022 | $0.00213 |
| Opus 5 | $0.00011 | $0.00106 |
| Sonnet 5 | $0.00004 | $0.00043 |
| Haiku 4.5 | $0.00002 | $0.00021 |
Grade A, and why
fix-merge-conflicts 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 8d 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.
This is a copy
91% identical to fix-merge-conflicts — 1 line differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.
What it actually says
Fix merge conflicts
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- Stage resolved files and summarize key decisions.
Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
Output
- Files resolved
- Notable resolution choices
- Build/test outcome
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.
- 8d ago First seen · 34 lines · 22 tokens per session scan A 45f176971476
fix-merge-conflicts is a skill published in the GitHub repository michael-denyer/pstack-claude (232 stars, last pushed 2d ago), licensed MIT. It adds 22 tokens to every session and 213 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. It is 91% identical to fix-merge-conflicts, differing in 1 line, and is treated as a copy.
Other skills, from other repositories
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
codex-autoresearch
Run autonomous, measurable experiments in a Git repository: change one hypothesis, verify a numeric metric, keep improvements, and revert failures. Use when the user wants Codex to keep iterating toward a numeric target in the foreground or as a detached background run. Do not use for ordinary one-shot coding…
changelog-composer
Generates structured changelogs and release notes from git history and PRs, classifying breaking changes, features, fixes, performance, docs. Triggers on: "generate changelog", "write release notes", "what changed since", "prepare release", "release notes for", "diff since tag".