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.
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.
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 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.
Documented attack patterns abuse exactly the kind of access resolve_conflict gives an agent:
PolicyLayer is an MCP gateway — it sits between your AI agents and MegaMemory, and nothing reaches the server without passing your rules. This is the rule we recommend for resolve_conflict:
{
"version": "1",
"default": "deny",
"tools": {
"resolve_conflict": {
"limits": [
{
"counter": "resolve_conflict_rate",
"window": "minute",
"max": 30,
"scope": "grant"
}
]
}
}
}resolve_conflict stays usable, but capped — an agent stuck in a loop can't make hundreds of changes a minute. Everything else on the server is denied unless you say otherwise.
Free to start. No card required.
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. It is categorised as a Write tool in the MegaMemory MCP Server, which means it can create or modify data. Consider rate limits to prevent runaway writes.
Register the MegaMemory MCP server in PolicyLayer and add a rule for resolve_conflict: allow, deny, rate-limit, or require approval. Point your MCP client at the PolicyLayer proxy URL and the rule is enforced on every call, before it reaches MegaMemory. Nothing to install.
resolve_conflict is a Write tool with medium risk. Write tools should be rate-limited to prevent accidental bulk modifications.
Yes. Add a rate_limit block to the resolve_conflict rule in your PolicyLayer policy. For example, setting max: 10 and window: 60 limits the tool to 10 calls per minute. Rate limits are tracked per agent session and reset automatically.
Set action: deny in the PolicyLayer policy for resolve_conflict. The AI agent will receive a policy violation error and cannot call the tool. You can also include a reason field to explain why the tool is blocked.
resolve_conflict is provided by the MegaMemory MCP server (0xk3vin/megamemory). PolicyLayer sits as a proxy in front of this server to enforce policies before tool calls reach the server.
Deterministic rules across all 9 MegaMemory tools. Per-identity grants. Full audit log. Live in minutes. Nothing to install.
Free to start. No card required.
9 MegaMemory tools catalogued and risk-classified — across an index of 42,500+ MCP servers.