# Resolve sync conflicts

> When the same note changes on two offline devices, Nimbus keeps both. Here is how to merge them.

Source: https://helpdox.fekbd.com/docs/nimbus-mobile/troubleshooting/sync-conflicts/

A conflict happens when the same note is edited on two devices that are both offline.

## Find conflicted notes

Conflicted notes show an orange dot and appear under **Folders → Conflicts**.

## Merge the versions

1. Open the note and tap **Compare**.
2. Pick a version, or copy the parts you need from each.
3. Tap **Resolve** to keep the result and remove the copy.

### Avoiding conflicts

Let a device sync for a few seconds before you switch to another one, especially after long offline sessions.