---
title: "Resolve Conflict"
method: POST
path: "/conflicts/{conflict_id}/resolve"
---

# Resolve Conflict

`POST /conflicts/{conflict_id}/resolve`

## Request

- Base URL: `https://cathedral-ai.com` (the document declares no server; this is the origin it was published from)
- URL: `https://cathedral-ai.com/conflicts/{conflict_id}/resolve`
- Auth: none declared. Required headers: `authorization`

## Path parameters

- `conflict_id` string, required

## Headers

- `authorization` string, required

## Request body

- ConflictResolve
  - `resolution` string, required: keep_a | keep_b | merge
  - `resolved_content` string, nullable

## Response `200`

Successful Response

- unknown

## Other responses

- `422`: Validation Error

---

[API](https://skmtc.dev/cathedral-ai/apis/cathedral-memory-service.md) · [All operations](https://skmtc.dev/cathedral-ai/apis/cathedral-memory-service/llms.txt) · [OpenAPI document](https://skmtc.dev/cathedral-ai/apis/cathedral-memory-service/revisions/e40fefc11dcf?raw)