> ## Documentation Index
> Fetch the complete documentation index at: https://docs.memloom.dev/llms.txt
> Use this file to discover all available pages before exploring further.

# Resolve a conflict

> Apply one of the four human-in-the-loop resolutions. Every resolution is non-destructive
and reversible via the revert endpoint: losing memories are marked `stale` and kept
in the store.




## OpenAPI

````yaml /openapi.yaml post /memory/conflicts/{id}/resolve
openapi: 3.1.0
info:
  title: memloom local API
  version: 0.1.0
  description: >
    The HTTP API served by the `memloom serve` daemon on your machine. The CLI,
    the MCP server,

    and the viewer all route through this API. The daemon is the single owner of
    the store, so

    every client shares one consistent view of your memories.


    No authentication: the daemon binds to `127.0.0.1` only and is reachable
    solely from your

    own machine. Browser clients on other localhost ports are allowed via CORS.
servers:
  - url: http://127.0.0.1:4319
    description: Local memloom daemon
security: []
paths:
  /memory/conflicts/{id}/resolve:
    post:
      summary: Resolve a conflict
      description: >
        Apply one of the four human-in-the-loop resolutions. Every resolution is
        non-destructive

        and reversible via the revert endpoint: losing memories are marked
        `stale` and kept

        in the store.
      operationId: resolveConflict
      parameters:
        - name: id
          in: path
          required: true
          schema:
            type: string
          description: The conflict id from the save response or the conflicts list.
      requestBody:
        required: true
        content:
          application/json:
            schema:
              $ref: '#/components/schemas/ResolveDecision'
      responses:
        '200':
          description: Resolution applied.
          content:
            application/json:
              schema:
                type: object
                properties:
                  ok:
                    type: boolean
                    example: true
        '400':
          $ref: '#/components/responses/ValidationError'
components:
  schemas:
    ResolveDecision:
      oneOf:
        - type: object
          title: keep_new
          required:
            - action
          properties:
            action:
              type: string
              enum:
                - keep_new
              description: The new memory wins; existing candidates go stale.
        - type: object
          title: keep_existing
          required:
            - action
            - candidateId
          properties:
            action:
              type: string
              enum:
                - keep_existing
            candidateId:
              type: string
              description: The existing memory that wins; the new one goes stale.
        - type: object
          title: keep_both
          required:
            - action
          properties:
            action:
              type: string
              enum:
                - keep_both
              description: Mark them distinct; both stay active.
        - type: object
          title: merge
          required:
            - action
            - content
          properties:
            action:
              type: string
              enum:
                - merge
            content:
              type: string
              description: The reconciled memory text that supersedes both.
            canonical:
              type: string
  responses:
    ValidationError:
      description: The request body failed validation. `issues` names each offending field.
      content:
        application/json:
          schema:
            type: object
            properties:
              error:
                type: string
                example: invalid request body
              issues:
                type: array
                items:
                  type: object
                  properties:
                    path:
                      type: string
                      example: query
                    message:
                      type: string
                      example: query must be a non-empty string

````