---
title: "Resolve a specific conflict with one of the three enum variants."
method: PUT
path: "/v1/agents/conflicts/{id}/resolve"
tags: ["Agents"]
---

# Resolve a specific conflict with one of the three enum variants.

`PUT /v1/agents/conflicts/{id}/resolve`

## Path parameters

- `id` string, required

## Request body

- object — Resolve a specific conflict with one of the three enum variants.
  - `resolution` 'resolved_new' | 'resolved_existing' | 'resolved_both', required

## Response `200`

Resolution confirmation.

- object — Resolved-conflict echo.
  - `id` string, required
  - `status` 'resolved_new' | 'resolved_existing' | 'resolved_both', required

## Other responses

- `400` — Input validation error
- `500` — Internal server error
- `502` — Upstream AI provider returned an unrecoverable failure (auth, non-retryable 4xx).
- `503` — Upstream AI provider is rate-limited, quota-exhausted, or returned 5xx; consult `retryable`.

---

[API](https://skmtc.net/atomicstrata/apis/atomicmemory-http-api.md) · [All operations](https://skmtc.net/atomicstrata/apis/atomicmemory-http-api/llms.txt) · [OpenAPI document](https://skmtc-service-staging.skmtc.workers.dev/v1/apis/atomicstrata/atomicmemory-http-api/versions/d501daa39bb2/schema)