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

# Resolve Merge Conflict

> Resolve a memory merge conflict by answering clarifying questions.

Submit answers to the AI-generated clarifying questions to resolve memory conflicts.
The system will use your answers to determine how to merge or update the conflicting memories.
After resolution, the conflict status changes to IN_QUEUE for processing.

**Path Parameters:**
- `custom_user_id` (str): Unique identifier for the user owning the merge conflict
- `conflict_id` (UUID): Merge conflict UUID to resolve

**Body Parameters:**
- `answers` (UserResponseMergeConflictQuestionAnswers): List of question-answer pairs matching the clarifying questions

**Returns:**
- `conflict` (MergeConflictInfo): Updated conflict with resolution_data, IN_QUEUE status, and resolved_at timestamp



## OpenAPI

````yaml https://api.recallrai.com/api/openapi.json post /api/v1/users/{custom_user_id}/merge-conflicts/{conflict_id}/resolve
openapi: 3.1.0
info:
  title: api-backend
  description: This powers the Recallr AI API Backend
  version: 0.1.0
servers:
  - url: https://api.recallrai.com
    description: Production server
security: []
paths:
  /api/v1/users/{custom_user_id}/merge-conflicts/{conflict_id}/resolve:
    post:
      tags:
        - Merge Conflicts
      summary: Resolve Merge Conflict
      description: >-
        Resolve a memory merge conflict by answering clarifying questions.


        Submit answers to the AI-generated clarifying questions to resolve
        memory conflicts.

        The system will use your answers to determine how to merge or update the
        conflicting memories.

        After resolution, the conflict status changes to IN_QUEUE for
        processing.


        **Path Parameters:**

        - `custom_user_id` (str): Unique identifier for the user owning the
        merge conflict

        - `conflict_id` (UUID): Merge conflict UUID to resolve


        **Body Parameters:**

        - `answers` (UserResponseMergeConflictQuestionAnswers): List of
        question-answer pairs matching the clarifying questions


        **Returns:**

        - `conflict` (MergeConflictInfo): Updated conflict with resolution_data,
        IN_QUEUE status, and resolved_at timestamp
      operationId: >-
        resolve_merge_conflict_api_v1_users__custom_user_id__merge_conflicts__conflict_id__resolve_post
      parameters:
        - name: custom_user_id
          in: path
          required: true
          schema:
            type: string
            description: Custom user ID owning the merge conflict
            title: Custom User Id
          description: Custom user ID owning the merge conflict
        - name: conflict_id
          in: path
          required: true
          schema:
            type: string
            format: uuid
            description: ID of the merge conflict to resolve
            title: Conflict Id
          description: ID of the merge conflict to resolve
        - name: X-Recallr-Project-Id
          in: header
          required: true
          schema:
            type: string
            format: uuid
            title: X-Recallr-Project-Id
        - name: X-Recallr-Api-Key
          in: header
          required: true
          schema:
            type: string
            title: X-Recallr-Api-Key
      requestBody:
        required: true
        content:
          application/json:
            schema:
              $ref: '#/components/schemas/UserResponseMergeConflictQuestionAnswers'
              description: Answers to clarifying questions
      responses:
        '200':
          description: Merge conflict resolved successfully
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/ResolveMergeConflictResponse'
        '400':
          description: Bad request - conflict already resolved or invalid data
        '401':
          description: Authentication required
        '404':
          description: User or merge conflict not found
        '422':
          description: Validation Error
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/HTTPValidationError'
        '500':
          description: Internal server error
components:
  schemas:
    UserResponseMergeConflictQuestionAnswers:
      properties:
        question_answers:
          items:
            $ref: '#/components/schemas/UserResponseMergeConflictQuestion'
          type: array
          title: Question Answers
      type: object
      required:
        - question_answers
      title: UserResponseMergeConflictQuestionAnswers
    ResolveMergeConflictResponse:
      properties:
        detail:
          type: string
          title: Detail
          default: ok
      type: object
      title: ResolveMergeConflictResponse
      description: Response after resolving a merge conflict.
    HTTPValidationError:
      properties:
        detail:
          items:
            $ref: '#/components/schemas/ValidationError'
          type: array
          title: Detail
      type: object
      title: HTTPValidationError
    UserResponseMergeConflictQuestion:
      properties:
        question:
          type: string
          title: Question
        answer:
          type: string
          title: Answer
        message:
          anyOf:
            - type: string
            - type: 'null'
          title: Message
      type: object
      required:
        - question
        - answer
      title: UserResponseMergeConflictQuestion
    ValidationError:
      properties:
        loc:
          items:
            anyOf:
              - type: string
              - type: integer
          type: array
          title: Location
        msg:
          type: string
          title: Message
        type:
          type: string
          title: Error Type
        input:
          title: Input
        ctx:
          type: object
          title: Context
      type: object
      required:
        - loc
        - msg
        - type
      title: ValidationError

````