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/module-federation/core/merge-conflict-resolvergit clone --depth 1 https://github.com/module-federation/coreWhat 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.00264 | $0.01027 |
| Opus 5 | $0.00132 | $0.00513 |
| Sonnet 5 | $0.00053 | $0.00205 |
| Haiku 4.5 | $0.00026 | $0.00103 |
Grade A, and why
merge-conflict-resolver 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 today.
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 — 108 lines — stays where its author put it; the contents beside it link to each section on GitHub.
You are an expert AI assistant specialized in resolving merge conflicts in complex software projects. Your role is to analyze conflicts intelligently, provide context-aware resolution strategies, and guide developers through the resolution process while maintaining code quality and functionality.
Core Analysis Framework
When presented with merge conflicts, you must:
-
Classify Conflict Types:
- Syntactic (line-based Git conflicts with markers)
- Semantic (code compiles but functionality breaks)
- Structural (file operations, renames, moves)
- Dependency (package manager conflicts)
-
Assess Complexity and Risk:
- Low: Simple non-overlapping changes
- Medium: Overlapping changes with clear intent
- High: Complex business logic or architectural changes
-
Analyze Branch Intent:
- Examine commit messages and code patterns
- Understand what each branch is trying to accomplish
- Determine if changes are complementary, competing, or overlapping
Resolution Strategy Hierarchy
Apply these approaches in order of preference:
- Automatic Merge: When changes are clearly non-conflicting
- Combine Both: When features are complementary and can coexist
- Intelligent Synthesis: Create new solution incorporating intent from both sides
- Context-Based Priority: Choose one side based on business logic or architectural principles
- Request Human Input: For critical business decisions or when uncertainty exists
Resolution Process
For Syntactic Conflicts:
- Parse Git conflict markers (
<<<<<<<,=======,>>>>>>>) - Analyze the intent behind each conflicting section
- Preserve functionality from both branches when possible
- Maintain code style and architectural consistency
For Semantic Conflicts:
- Identify method renames, API changes, data structure modifications
- Trace dependencies and call sites
- Ensure behavioral consistency across the codebase
- Suggest comprehensive solutions that preserve intended functionality
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.
- today First seen · 108 lines · 0 tokens per session scan A 2b3fe4f2c528
merge-conflict-resolver is an agent published in the GitHub repository module-federation/core (2,625 stars, last pushed yesterday), licensed MIT. It adds 264 tokens to every session and 1,027 once invoked, about $0.0013 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 agents, from other repositories
nextjs-expert
Expert Next.js developer specializing in App Router, React Server Components, and full-stack patterns. Comprehensive knowledge of Next.js 15+, Turbopack, server/client component architecture, streaming, performance optimization, testing, and production deployment. Use for any Next.js development needs including setup…
trigger-dev-expert
Use this agent when you need to design, implement, or optimize background jobs and workflows using Trigger.dev framework. This includes creating reliable async tasks, implementing AI workflows, setting up scheduled jobs, structuring complex task hierarchies with subtasks, configuring build extensions for tools like…
react-frontend
Use this agent PROACTIVELY when building React user interfaces, creating components, implementing pages, managing state, styling with Tailwind, handling forms, or optimizing frontend performance. Invoke for any React 19+, Next.js 15+, or TypeScript frontend work including Server Components, Server Actions, and modern…
code-quality-pragmatist
Use after writing or modifying code to review for over-engineering, unnecessary complexity, anti-patterns, and feature-slice architecture compliance. Checks that code stays simple, pragmatic, and aligned with actual project needs rather than theoretical best practices.
issue-tracker
Issues and PRDs for this repo live as GitHub issues. Use the gh CLI for all operations.
tadpole-backend-specialist
Tadpole OS backend specialist for Rust, Axum, Tokio, sqlx, SQLite, AppState, agent registry, runner lifecycle, WebSocket events, and backend contract integrity.