# resolve_conflict

Resolve a merge conflict by providing the correct resolved content. Read both conflict versions, verify against the current codebase, then provide the accurate resolved summary. Do NOT just pick a side — write the truth.

Agent View of the PolicyLayer registry record for `resolve_conflict`. HTML page: https://policylayer.com/tools/0xk3vin-megamemory/resolve-conflict

## Facts

- Tool: `resolve_conflict`
- Server: MegaMemory (`0xk3vin/megamemory`) — https://policylayer.com/tools/0xk3vin-megamemory.md
- Homepage: https://github.com/0xK3vin/MegaMemory
- Risk category: Write (Medium risk)
- Registry record: grade D, identity unverified
- Server rate-limited: no
- Parameters: 0
- Recommended policy verdict: Rate-limited

## Example call (MCP tools/call, JSON-RPC 2.0)

```json
{
  "jsonrpc": "2.0",
  "id": 1,
  "method": "tools/call",
  "params": {
    "name": "resolve_conflict",
    "arguments": {}
  }
}
```

## Why resolve_conflict is rated Medium

This tool modifies persistent knowledge graph data (the resolved conflict content), making it a Write operation. Severity is high because an AI agent misclassifying or incorrectly resolving conflicts could corrupt architectural knowledge, decisions, or concept relationships across sessions, affecting downstream reasoning and code generation.

From the tool's own definition: "Tool 'resolve_conflict' performs 'Resolve a merge conflict by providing the correct resolved content', which modifies the knowledge graph state by writing a resolved summary."

## Use case

AI agents use resolve_conflict to create or update resources in MegaMemory, usually the action step of a workflow, after the agent has gathered context. Every call changes real data in your MegaMemory environment.

## Recommended policy (PolicyLayer)

Verdict: **Rate-limited**. Enforced by the PolicyLayer MCP gateway (https://policylayer.com/mcp-gateway) before a call reaches MegaMemory:

```json
{
  "version": "1",
  "default": "deny",
  "tools": {
    "resolve_conflict": {
      "limits": [
        {
          "counter": "resolve_conflict_rate",
          "window": "minute",
          "max": 30,
          "scope": "grant"
        }
      ]
    }
  }
}
```

## Other tools on MegaMemory (8)

- `remove_concept` — Destructive — https://policylayer.com/tools/0xk3vin-megamemory/remove-concept.md
- `get_concept` — Read — https://policylayer.com/tools/0xk3vin-megamemory/get-concept.md
- `list_conflicts` — Read — https://policylayer.com/tools/0xk3vin-megamemory/list-conflicts.md
- `list_roots` — Read — https://policylayer.com/tools/0xk3vin-megamemory/list-roots.md
- `understand` — Read — https://policylayer.com/tools/0xk3vin-megamemory/understand.md
- `create_concept` — Write — https://policylayer.com/tools/0xk3vin-megamemory/create-concept.md
- `link` — Write — https://policylayer.com/tools/0xk3vin-megamemory/link.md
- `update_concept` — Write — https://policylayer.com/tools/0xk3vin-megamemory/update-concept.md

## For agents

This record is a snapshot. Live verdicts and the full registry:

- Check every server in your MCP config at once: `npx -y policylayer stack`
- Vet a server before you add it: install the mcp-precheck skill — `npx skills add https://policylayer.com` (skill text: https://policylayer.com/skill.md)
- Query the registry over MCP: endpoint `https://api.policylayer.com/mcp` — tools `check_mcp_server`, `check_mcp_stack`, `check_tool`, `search_registry`, `get_change_events`

---

Source: the PolicyLayer MCP registry — one continuously verified record per MCP server. Full record: https://policylayer.com/registry?q=0xk3vin-megamemory · API: https://policylayer.com/registry/api · Policy library: https://policylayer.com/policies/0xk3vin-megamemory