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/.claude/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.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.00047 | $0.00618 |
| Opus 5 | $0.00023 | $0.00309 |
| Sonnet 5 | $0.00009 | $0.00124 |
| Haiku 4.5 | $0.00005 | $0.00062 |
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 5d 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 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.
- 5d 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 (132 stars, last pushed 2d ago), licensed GPL-3.0. It adds 47 tokens to every session and 618 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-09-01.
Other skills, from other repositories
git-commit
Generate well-formatted git commit messages following conventional commit standards.
mcore-split-pr
Split a PR into multiple PRs to reduce the number of required CODEOWNERS reviewer groups.
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…
commit
Read this skill before making git commits.
git-commit
当用户明确要求"提交 Git 改动"、"生成 commit 信息"或"创建 git commit"时使用。仅用 Git 分析改动并自动生成 conventional commit 信息（可选 emoji）；必要时建议拆分提交，默认运行本地 Git 钩子（可 --no-verify 跳过），提交后默认自动 push（可 --no-push 跳过）。.
setup-husky-dotnet
Use when configuring Git hooks in .NET projects before team commits occur, to enforce commit message standards and code formatting automatically.