# Conflictfix

> Conflictfix is an open-source MCP server. Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual. It runs locally on your machine and is started by your AI client.

- **Kind:** MCP server
- **Pricing:** Open source
- **Repository:** https://github.com/cloudcorprecords/conflictfix
- **MCP Registry name:** io.github.CloudCorpRecords/conflictfix
- **Listing updated:** 2026-11-13

## About

Classify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.

## Install

### Claude Code (Terminal)

```sh
claude mcp add conflictfix -- npx -y @reneturcios/conflictfix
```

### Claude Desktop (claude_desktop_config.json)

```json
{
  "mcpServers": {
    "conflictfix": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}
```

### Cursor (~/.cursor/mcp.json)

```json
{
  "mcpServers": {
    "conflictfix": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}
```

### VS Code (.vscode/mcp.json)

```json
{
  "servers": {
    "conflictfix": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}
```

### Windsurf (~/.codeium/windsurf/mcp_config.json)

```json
{
  "mcpServers": {
    "conflictfix": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}
```

### Other clients (your client's MCP settings (most use this shape))

```json
{
  "mcpServers": {
    "conflictfix": {
      "command": "npx",
      "args": [
        "-y",
        "@reneturcios/conflictfix"
      ]
    }
  }
}
```

## FAQ

### Is Conflictfix free?

Yes. Conflictfix is open source, so you can use and self-host it for free.

### How do I add Conflictfix to Claude Code?

Run this command in your terminal: claude mcp add conflictfix -- npx -y @reneturcios/conflictfix

## Where this comes from

- Description: from the official MCP Registry entry.
- Install steps: from the official MCP Registry entry.

---
Source: https://ai-powered.com/mcp/conflictfix
