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/latestaiagents/agent-skillsWrote 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/latestaiagents/agent-skills/resolve-conflict)<a href="https://agentmods.dev/commands/latestaiagents/agent-skills/resolve-conflict"><img src="https://agentmods.dev/badge/commands/latestaiagents/agent-skills/resolve-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/latestaiagents/agent-skills/resolve-conflict"><img src="https://agentmods.dev/badge/commands/latestaiagents/agent-skills/resolve-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.00008 | $0.00429 |
| Opus 5 | $0.00004 | $0.00215 |
| Sonnet 5 | $0.00002 | $0.00086 |
| Haiku 4.5 | $0.00001 | $0.00043 |
Grade A, and why
resolve-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 9d 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
/resolve-conflict
Systematic merge conflict resolution. I'll analyze each conflict and help you resolve it correctly.
Step 1: Identify All Conflicts
# List all conflicted files
git diff --name-only --diff-filter=U
Step 2: Analyze Each Conflict
For each conflicted file, I'll show you:
- What changed in YOUR branch (HEAD)
- What changed in THEIR branch (incoming)
- What the common ancestor looked like (base)
- Recommended resolution with reasoning
Conflict Format Explained
<<<<<<< HEAD
Your changes (current branch)
=======
Their changes (incoming branch)
>>>>>>> branch-name
Step 3: Resolution Strategy
For each conflict, I'll recommend one of:
| Strategy | When to Use |
|---|---|
| Keep Ours | Your changes are correct, discard theirs |
| Keep Theirs | Their changes are correct, discard yours |
| Merge Both | Both changes are needed, combine them |
| Rewrite | Neither is right, write new code |
Step 4: Resolve Systematically
For each file:
# View the conflict in context
git diff --cc filename
# After resolving:
git add filename
Step 5: Complete the Merge
# Verify all conflicts resolved
git diff --name-only --diff-filter=U # Should be empty
# Complete the merge
git commit -m "Merge branch 'feature' - resolved conflicts in [files]"
Conflict Prevention Tips
- Pull frequently - Smaller, more frequent merges = fewer conflicts
- Communicate - Know who's working on what files
- Use feature flags - Merge incomplete features safely
- Rebase before merge -
git pull --rebase origin main
Show me the conflicted file(s) and I'll analyze each conflict.
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.
- 9d ago First seen · 78 lines · 8 tokens per session scan A 5a596b462d8c
resolve-conflict is a command published in the GitHub repository latestaiagents/agent-skills (5 stars, last pushed 4mo ago), licensed MIT. It adds 8 tokens to every session and 429 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
fdk-react-create
Create a new Platform 3.0 React Meta app (default UI stack). Uses fdk create react-starter-template or react-meta skeletons with DEW components, metaConfig in manifest.json, and React Router.
fdk-refactor
Reduce function complexity in a Freshworks app to meet cyclomatic complexity ≤ 7 per function. Extracts helper functions, simplifies conditionals, and preserves behavior while improving code quality.
pr-enhance
Command "pr-enhance" from smith-horn/skillsmith, covering pr-enhance, usage, options, examples and fetch/manage pr data via the cli escape hatch.
fw-setup-uninstall
Uninstall FDK completely — keeps Node.js and nvm (/fw-setup uninstall).
conventional-commit
Generate and execute conventional commit messages following the Conventional Commits spec.
checklist
Generate a custom checklist for the current feature based on user requirements.