# ChangeRequestConflictState

**Kind:** Interface

**Source:** [`atloria-monorepo/packages/api-client/src/endpoints/change-requests.ts`](https://github.com/sherkety/atloria/blob/main/atloria-monorepo/packages/api-client/src/endpoints/change-requests.ts#L57)

Persisted when a merge attempt (or a diff refresh) found sections conflicting with newer
changes on main — the CR flips back to 'open' and merges are blocked until resolved

## Properties

| Property | Type |
|---|---|
| `files` | `ChangeRequestConflictFile[]` |
| `detectedAt` | `string` |