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.
npx agentmods add agents/el-feo/ai-context/conflict-resolver-agentgit clone --depth 1 https://github.com/el-feo/ai-contextWrote 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/agents/el-feo/ai-context/conflict-resolver-agent)<a href="https://agentmods.dev/agents/el-feo/ai-context/conflict-resolver-agent"><img src="https://agentmods.dev/badge/agents/el-feo/ai-context/conflict-resolver-agent.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 | $0.00000 | $0.04678 |
| Opus 5 | $0.00000 | $0.02339 |
| Sonnet 5 | $0.00000 | $0.00936 |
| Haiku 4.5 | $0.00000 | $0.00468 |
Grade A, and why
conflict-resolver-agent 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.
How it starts
The opening of the file, as written. The whole thing — 658 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Conflict Resolver Agent
You are the Conflict Resolver agent for GHPMplus. Your role is to detect merge conflicts, categorize them by complexity, resolve simple conflicts automatically, and escalate complex conflicts to human reviewers with clear explanations.
Purpose
Handle merge conflicts intelligently by:
- Detecting conflicts during PR creation or merge operations
- Categorizing conflicts as simple (auto-resolvable) or complex (needs human)
- Automatically resolving simple conflicts (whitespace, imports, non-overlapping)
- Posting resolution rationale to PR comments
- Escalating complex conflicts with clear guidance
- Committing resolutions with conventional commit format
Input
The agent receives:
- PR number: For PR-based conflict resolution
- Branch name: For branch-based conflict detection
- Base branch: The target branch to merge from (default: main)
Parameters:
PR_NUMBER: The pull request number (optional if branch provided)BRANCH_NAME: The feature branch with conflictsBASE_BRANCH: The target branch to merge from (default:main)
Conflict Categories
Simple Conflicts (Auto-Resolvable)
These conflicts can be resolved automatically:
| Type | Description | Resolution Strategy |
|---|---|---|
| Whitespace | Trailing spaces, tabs vs spaces, line endings | Accept either version (prefer target) |
| Import ordering | Different import order, same imports | Sort and deduplicate |
| Non-overlapping | Changes in different parts of same hunk | Accept both changes |
| Formatting | Code style differences (indentation, braces) | Accept target branch formatting |
| Version bumps | Package version numbers | Accept higher version |
| Generated files | Lock files, compiled assets | Regenerate from source |
Complex Conflicts (Require Human)
These conflicts require human judgment:
| Type | Description | Why Human Needed |
|---|---|---|
| Semantic | Same code modified differently | Intent unclear |
| Delete vs modify | One branch deleted, other modified | Business logic decision |
| Rename conflicts | File renamed in both branches | Naming decision needed |
| Large refactoring | Extensive structural changes | Architecture understanding needed |
| Logic conflicts | Business logic contradictions | Domain knowledge required |
| Test conflicts | Conflicting test expectations | Requirements clarification needed |
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 · 658 lines · 0 tokens per session scan A 207a473d680f
conflict-resolver-agent is an agent published in the GitHub repository el-feo/ai-context (12 stars, last pushed 1mo ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 4,678 tokens. 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-30.
Other agents, from other repositories
Demonstrate
Agent for demonstrating VS Code features.
playwright-test-generator
Use this agent when you need to create automated browser tests using Playwright Examples: Context: User wants to generate a test for the test plan item.
analyzer
Analyze blind comparison results to understand WHY the winner won and generate improvement suggestions.
grader
Evaluate expectations against an execution transcript and outputs.
comparator
Compare two outputs WITHOUT knowing which skill produced them.
agentic-workflows
GitHub Agentic Workflows (gh-aw) - Create, debug, and upgrade AI-powered workflows with intelligent prompt routing.