# ath conflicts

> Review and resolve package import conflicts.

Website: https://ath.fit/docs/conflicts/
Markdown: https://ath.fit/docs/conflicts.md

ATH v1.0.0 · MIT license. Documentation source: [7cd6a09](https://github.com/mwhitham/ath/blob/7cd6a097dbf2a12c7ea8a319869d4e0bb0def96b/src/program.ts). If your installed version differs, check its command help.

Checked 18 October 2026: v1.0.0 is available on npm.

## Usage

```text
ath conflicts show
ath conflicts resolve <record-id> --choice local
```

## What it does

Shows complete local and imported values from the current temporary conflict set. A resolution records a local, imported or corrected choice without changing athlete data.

## Finish the import

After every conflict has a choice, rerun the exact package import with --yes. A changed package or database makes saved choices stale.

```text
ath import ./saved-package --yes
```

## Resolution options

| Argument or option | Description |
| --- | --- |
| `--choice <choice>` | local, imported or corrected |
| `--data <json>` | complete corrected data object; required with corrected |
| `--file <path>` | use conflicts for another database |
| `--json` | structured output |