Best Conflict AI Skills & MCP Servers
6 curated Conflict skills and MCP servers — install any of them into Claude, Cursor, ChatGPT, n8n, or any AI stack with one command.
Migration Advisor
MCP server for database migration risk analysis — Flyway and Liquibase XML/YAML/SQL support with lock detection and conflict analysis
Semamerge
MCP server that detects semantic (non-textual) merge conflicts between Git branches using AST-level analysis
Acled
ACLED MCP — Armed Conflict Location & Event Data Project
Mcp
Versioned memory for AI agents — structured keypaths, conflict detection, and 80% fewer tokens than alternatives.
Mcp
GitWand MCP server — smart Git conflict resolution for AI agents (Claude, Cursor, Windsurf, Claude Code)
outtolunch
Daily world briefing that tells AI assistants what's actually happening right now. Leaders, conflicts, deaths, economic data, holidays. Updated daily so they stop getting current events wrong.
About Conflict skills on iClaude
iClaude is the universal install layer for AI skills. Every Conflict skill on this page can be installed into Claude Code, Claude Desktop, Cursor, ChatGPT, n8n, Codex, and more — using a single copy-paste command. No config drift, no per-stack adapters, no manual MCP wiring.