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.
git clone --depth 1 https://github.com/nolabs-ai/claude-extensionsWrote 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/commands/nolabs-ai/claude-extensions/merge-conflict)<a href="https://agentmods.dev/commands/nolabs-ai/claude-extensions/merge-conflict"><img src="https://agentmods.dev/badge/commands/nolabs-ai/claude-extensions/merge-conflict/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/commands/nolabs-ai/claude-extensions/merge-conflict"><img src="https://agentmods.dev/badge/commands/nolabs-ai/claude-extensions/merge-conflict.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.00005 | $0.00402 |
| Opus 5 | $0.00003 | $0.00201 |
| Sonnet 5 | $0.00001 | $0.00080 |
| Haiku 4.5 | $0.00001 | $0.00040 |
Grade A, and why
merge-conflict 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 11d 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
Help the user resolve git merge conflicts interactively.
Process
-
Identify Conflicts Run
git statusto find files with merge conflicts. -
For Each Conflicted File
- Read the file and find conflict markers (
<<<<<<<,=======,>>>>>>>) - Understand both versions (current branch and incoming changes)
- Explain what each version does
- Read the file and find conflict markers (
-
Guide Resolution
- Ask the user which changes to keep
- Suggest a merged solution when appropriate
- Make the edits to resolve the conflict
-
Complete Resolution
- Stage the resolved file:
git add <file> - Check if more conflicts exist
- When all resolved, suggest completing the merge/rebase
- Stage the resolved file:
Conflict Marker Format
<<<<<<< HEAD (or current branch name)
Your current changes
=======
Incoming changes being merged
>>>>>>> branch-name (or commit hash)
Output Format
For each conflict:
File: path/to/file.js
Current branch changes:
// Show the code from current branch
Incoming changes:
// Show the code being merged in
Explanation: [Describe what each version does and why they conflict]
Suggested Resolution:
// Show recommended merged code
Options:
- Keep current branch version
- Keep incoming version
- Use suggested merge
- Custom resolution (describe your preference)
Arguments
If $ARGUMENTS contains a file path, focus on that file first.
Guidelines
- Explain the context of each conflicted section
- Consider the semantic meaning, not just line differences
- Suggest keeping both changes when they're additive
- Warn about potential issues in the resolution
- Test suggestions for syntax errors
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.
- 11d ago First seen · 81 lines · 5 tokens per session scan A 09ff1e0e67dc
merge-conflict is a command published in the GitHub repository nolabs-ai/claude-extensions (5 stars, last pushed 8mo ago), licensed MIT. It adds 5 tokens to every session and 402 once invoked, about $0.0000 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 commands, from other repositories
commit
A command that examines staged Git changes and proposes a commit message using the Conventional Commits format, such as feat, fix, or docs. Git is a tool for tracking changes to code.
release-notes
Generate consistent, well-structured release notes from git history. Triggered on release tags following semver patterns (v..) to produce categorized changelog with breaking changes, features, fixes, and contributor attribution.
doctor
Diagnosticar y reparar problemas del framework Don Cheli, git y entorno. Usa cuando el usuario dice "doctor", "problemas del framework", "don cheli no funciona", "repair Don Cheli", "debug setup", "setup broken", "framework broken", "reparar entorno". Detecta y repara issues de configuración, git y dependencias…
handoff
Export a Waybill Bundle by default, or import one when requested.
repo-audit
Audit a codebase (local or remote GitHub/GitLab) against architecture principles and requirements, surfacing drift, risk, and missing decisions.
release-plan
A release-planning command for a software change. It documents the release scope, rollback plan, gradual or full rollout, and monitoring before waiting for human approval.