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 perniemann/pnCore --skill pn-merge-conflict-fixgit clone --depth 1 https://github.com/perniemann/pnCoreWrote 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/perniemann/pncore/pn-merge-conflict-fix)<a href="https://agentmods.dev/skills/perniemann/pncore/pn-merge-conflict-fix"><img src="https://agentmods.dev/badge/skills/perniemann/pncore/pn-merge-conflict-fix/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/perniemann/pncore/pn-merge-conflict-fix"><img src="https://agentmods.dev/badge/skills/perniemann/pncore/pn-merge-conflict-fix.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.00033 | $0.00291 |
| Opus 5.5 | $0.00013 | $0.00116 |
| Sonnet 5.5 | $0.00007 | $0.00058 |
| Haiku 4.5 | $0.00003 | $0.00029 |
Grade A, and why
pn-merge-conflict-fix 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 1mo 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
Fix merge conflicts
When to use
- Branch has unresolved merge conflicts blocking a PR or build.
- CI fails with conflict markers (
<<<<<<<,=======,>>>>>>>) in tracked files. - After a rebase or merge from main/trunk that introduced conflicts.
- Post-parallel-specialist workflow merge step (full_dev merge phase).
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
Guardrails
- pn-ci-fix — Use when CI is failing due to code or config; use this skill when merge conflicts are blocking the branch.
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.
- 1mo ago First seen · 40 lines · 33 tokens per session scan A 47b959042ef0
pn-merge-conflict-fix is a skill published in the GitHub repository perniemann/pnCore (0 stars, last pushed 2d ago), licensed MIT. It adds 33 tokens to every session and 291 once invoked, about $0.0001 per session on Opus 5.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-09-03.
Other skills, from other repositories
t-800-plugin-sync
A procedural checklist for installing or synchronising the T-800 plugin in Cursor, including checking for outdated content and reloading the editor.
configure-workspaces
Propose and generate workspace configuration files (.humanlayer/workspace.json and .humanlayer/workspace.local.json) for a repository.
resolve-inputs
Select the Resolve mode, recover its input, check the workspace, and discover existing fixes.
feature-publish
Commit the feature, write the PR body, publish in the selected mode, and drive the PR.
otto-review-remediation
Handle trusted reviewers' change requests on Otto PRs.
feature-inputs
Read the input and ticket, choose the mode, run preflight, and check for existing delivery.