Borrowing it
Nothing to install: this file belongs to bitsocialnet/5chan. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/bitsocialnet/5chan/master/.agents/skills/fix-merge-conflicts/SKILL.mdgit clone --depth 1 https://github.com/bitsocialnet/5chanWrote 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/bitsocialnet/5chan/fix-merge-conflicts)<a href="https://agentmods.dev/skills/bitsocialnet/5chan/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/bitsocialnet/5chan/fix-merge-conflicts/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/bitsocialnet/5chan/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/bitsocialnet/5chan/fix-merge-conflicts.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.00018 | $0.00296 |
| Opus 5.5 | $0.00007 | $0.00118 |
| Sonnet 5.5 | $0.00004 | $0.00059 |
| Haiku 4.5 | $0.00002 | $0.00030 |
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 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.
The source is not reproduced here
Licensed GPL-3.0
The repository is licensed GPL-3.0, which this catalogue does not treat as permission to reproduce the file. Read it at the source.
What ships with it
1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.
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 Changed · -66 lines · -29 tokens per session 279d164dd0b2
- 1mo ago Changed a5883207d95f
- 1mo ago First seen · 84 lines · 47 tokens per session scan A d5a5def99577
fix-merge-conflicts is a skill published in the GitHub repository bitsocialnet/5chan (134 stars, last pushed 2d ago), licensed GPL-3.0. It adds 18 tokens to every session and 296 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-01.
Other skills, from other repositories
mcore-split-pr
Split a PR into multiple PRs to reduce the number of required CODEOWNERS reviewer groups.
git-commit-writer
Trigger when the user asks to write a commit message, generate a commit from staged changes, review a diff before committing, or says "/commit". Reads git diff --staged and produces an opinionated, convention-matching commit message.
commit
Use when the user invokes /commit or asks to commit changes, after a code review has been completed and the changes are confirmed ready to stage and commit to git.
strict-tdd
Strict RED->GREEN->REFACTOR test-driven development with enforcement. Never write production code before a failing test. Atomic commits per TDD cycle.
worktree-handoff
Create a git worktree for a task and record handoff context into a plan file that is committed to the branch. Discovers existing plan files in the user's configured todos or plans directory, appends a dated Handoff Context section, and commits everything before printing the next-session pickup message. Use when the…
git-commit
Creates git commits following Conventional Commits format with type/scope/subject and detailed markdown body. Use when user wants to commit changes, create commit, save work, or stage and commit. Enforces project-specific conventions from CLAUDE.md. Each change type gets its own markdown heading (# emoji + type), with…