Getting it into your agent
It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.
git clone --depth 1 https://github.com/ulises-jeremias/agent-toolkitnpx agentmods add skills/ulises-jeremias/agent-toolkit/fix-merge-conflictsWrote 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/ulises-jeremias/agent-toolkit/fix-merge-conflicts)<a href="https://agentmods.dev/skills/ulises-jeremias/agent-toolkit/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/ulises-jeremias/agent-toolkit/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/ulises-jeremias/agent-toolkit/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/ulises-jeremias/agent-toolkit/fix-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector pass
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.01032 |
| Opus 5 | $0.00011 | $0.00516 |
| Sonnet 5 | $0.00004 | $0.00206 |
| Haiku 4.5 | $0.00002 | $0.00103 |
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 6d 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.
How it starts
The opening of the file, as written. The whole thing — 66 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Fix Merge Conflicts
Resolve merge conflicts non-interactively and return the branch to a buildable state.
When to use
git statusshowsUnmerged pathsorCONFLICT, or the branch reports merge conflicts againstmain.- User asks to "fix merge conflicts", "resolve conflicts", "rebase and fix", or "make this branch mergeable".
- A PR is blocked by conflicts after pulling main.
Prerequisites
- Inside a Git repository with write access (
git statusworks). - Conflicts come from a merge or rebase (e.g.
git merge main,git pull --rebase,gh pr update-branch). - Toolchain available for validation: package manager (
npm/yarn/pnpm/bun/uv/cargo/etc.) andgit.
Workflow
-
Detect conflicts. Run
git status --porcelainand scan forUU/AA/DD/U*markers. Confirm withgrep -r "<<<<<<< " --include="*.md" --include="*.ts" --include="*.js" --include="*.py" --include="*.v" --include="*.yaml" --include="*.json" -l(andgit diff --checkfor leftover markers). List every conflicting file. -
Resolve each conflict with minimal, correctness-first edits. Open each file, read the
<<<<<<< / ======= / >>>>>>>hunks, and choose the merge that compiles and preserves public behavior. Prefer preserving both sides when safe; otherwise pick the variant that keeps the build green and does not change external API semantics. Keep edits readable — no broad refactors while resolving. -
Regenerate lockfiles via the package manager — do not hand-edit. If a lockfile is conflicted (
package-lock.json,yarn.lock,pnpm-lock.yaml,bun.lockb,Cargo.lock,uv.lock,go.sum,Gemfile.lock, etc.), discard conflict markers and regenerate:npm install --package-lock-only,yarn install,pnpm install,bun install,cargo update --workspace,uv lock, or the repo's documented install command. Confirm the manager that owns the file (checkpackage.jsonpackageManager,Makefile, orREADME.md). -
Validate. Run compile, lint, and the most relevant tests for the touched areas. At minimum:
git diff --check # no leftover markers / whitespace issues # then per-stack, e.g.: # npm run build / cargo check / v vet / make build # npm run lint / ruff check . / ./scripts/validate-skills.vsh # npm test -- <changed packages> / pytest -q <changed modules>Re-run until the working tree is clean of markers and the build succeeds.
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.
- 6d ago First seen · 66 lines · 22 tokens per session scan A ada35e42bf19
fix-merge-conflicts is a skill published in the GitHub repository ulises-jeremias/agent-toolkit (16 stars, last pushed today), licensed MIT. It adds 22 tokens to every session and 1,032 once invoked, about $0.0001 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-04.
Other skills, from other repositories
bisect
Use when hunting a regression, phrases like "bisect", "find the commit that broke X", "this used to work", "regression in test Y", "when did start". Also use when escalated from ci-debug-loop because log analysis can't pinpoint the offending change, or when a previously-passing test/build/behavior is now failing and…
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
debug-systematic
Systematic 4-phase debugging methodology for complex, intermittent, or mysterious issues. Use when investigating bugs, race conditions, or unexplained failures.
skillnote-doctor
A diagnostic tool for OpenClaw agents -- checks skill registry connectivity, AGENTS.md setup, config file validity, and installed skill health. Use when your setup seems broken, skills aren't loading, or you want to audit your agent's configuration.
hotfix
Fixes an observed defect with reproducible evidence in one call: writes a short trace doc before touching code, implements the fix, and backs it with a regression test written before the fix. Production incidents are the motivating case, not a gate. When blocked, it halts by name and saves the doc for a later call to…
iblai-api-agent-audit
Read an ibl.ai agent's audit log via the platform API — a who-changed-what trail filterable by action, actor email, and date range. Read-only. Use when investigating configuration changes to an agent.