Best Conflict Resolution AI Skills & MCP Servers

1 curated Conflict Resolution skills and MCP servers — install any of them into Claude, Cursor, ChatGPT, n8n, or any AI stack with one command.

Mcp

MCP Registry

GitWand MCP server — smart Git conflict resolution for AI agents (Claude, Cursor, Windsurf, Claude Code)

MCP Registry · ★ 5.0free

About Conflict Resolution skills on iClaude

iClaude is the universal install layer for AI skills. Every Conflict Resolution 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.

← browse the full catalog