# Resolve Conflict

Resolve a specific conflict by choosing which version to keep.

**Endpoint**: `POST /api/conflicts/:id/resolve`
**Auth**: Required
**Content-Type**: `application/json`

## Path Parameters

| Parameter | Type | Required | Description |
|-----------|------|-----------|-------------|
| id | string (UUID) | Yes | Conflict UUID |

## Request Body

| Field | Type | Required | Description |
|--------|------|-----------|-------------|
| resolution | string | Yes | Resolution strategy: "device", "server", or "highest_progress" |

### Example Request

```json
{
  "resolution": "device"
}
```

## Response (200 OK)

```json
{
  "message": "Conflict resolved successfully",
  "conflict_id": "uuid",
  "resolution": "device"
}
```

## Error Responses

| Code | Description |
|------|-------------|
| 400 | Invalid resolution strategy |
| 401 | Invalid or expired token |
| 404 | Conflict not found |
| 400 | Conflict already resolved |
