# Resolve conflicts from syncing

- Product: Crabwise
- Category: Library
- Type: How-to
- Updated: 2026-10-30
- URL: https://soji.dev/en/crabwise/support/library/resolve-conflicts/

If you change the same item on more than one Mac, the syncing service can create a second version. Crabwise lists items that have another version under :ui[Conflicts]. Choose which version to keep to resolve the conflict.

An item in conflict can't be edited until you resolve it. Crabwise keeps both versions as they are.

## Resolve a conflict

1. Click :ui[Conflicts] in the sidebar. It appears only when there are conflicts.
2. Click :ui[Resolve…] in the notice above the list. The :ui[Resolve Conflict] sheet opens. You can also select an item and choose :ui[Item] > :ui[Resolve Conflict…].
3. Compare :ui[This Mac’s Version] and :ui[Synced Version]. You'll see the modified dates and differences in name, notes, URL, collections, tags, rating, and so on.
4. Choose one of these:

| Button | Result |
| --- | --- |
| :ui[Use This Mac’s Version] | Keeps this Mac's version. |
| :ui[Use Synced Version] | Keeps the synced version. |
| :ui[Keep Both] | Adds the synced version's content as a new item. The original item stays as this Mac's version. |
| :ui[Decide Later] | Closes the sheet. The item stays in conflict and keeps appearing under :ui[Conflicts]. |

Whichever you pick, the kind and file name stay as they are in This Mac's Version.

If you turn on :ui[Move the conflicting copy to the Trash] at the bottom of the sheet before choosing, the conflicting file goes to the Trash once the conflict is resolved. It is off at first.

If there are several synced versions, the screen shows which one you are looking at, for example :ui[Synced Version 1 of 2].

When Crabwise could merge an item automatically, it shows :ui[Already merged], and the conflicting copy's file is left in place. A backup of this Mac's version from before the merge is saved in the item's folder.

## When a collection or tag file has a conflict

When another version is found for a file that isn't an item, no :ui[Resolve…] button appears. Crabwise keeps using the current file. Compare the versions in the library folder and choose one to keep. To compare, open the file in an app that supports version history (such as CotEditor) and choose :ui[File] > :ui[Revert To] > :ui[Browse All Versions].