> ## Documentation Index
> Fetch the complete documentation index at: https://elephas.app/docs/llms.txt
> Use this file to discover all available pages before exploring further.

# Resolve Sync Conflicts

> How Elephas handles the same thing edited on two computers. The newer edit wins, and the Sync Conflicts list keeps the replaced value until you dismiss it.

When two of your computers change the same thing before they sync, such as renaming the same Brain, the newer edit wins on every computer. Elephas keeps the value it replaced in **Settings › Sync › Sync Conflicts**, so nothing disappears without a trace.

<Info>
  Applies to Personal Sync, part of the Professional plan.
</Info>

## Before you start

You only see conflicts if you use [Personal Sync](/docs/sync-and-devices/personal-sync-overview) on two or more computers. The **Sync Conflicts** list appears in **Settings › Sync** only when there is something in it.

## Steps

<Steps>
  <Step title="Open Settings › Sync">
    On Mac, choose **Elephas › Settings…** or press **⌘,**. On Windows, choose **File › Settings…** or press **Ctrl+,**. Then choose **Sync**.
  </Step>

  <Step title="Review the Sync Conflicts list">
    Under **Sync Conflicts**, each row names what changed (**Brain name**, **Chat title** or **Chat scope**), the replaced value, and when it happened.
  </Step>

  <Step title="Keep the newer value, or put the old one back">
    If the newer value is right, do nothing. If you prefer the replaced value, change it back yourself, for example rename the Brain again. Your change then syncs to your other computers.
  </Step>

  <Step title="Dismiss the row">
    Click **Dismiss**. This removes the note only. It does not change the current value.
  </Step>
</Steps>

## How it works

The Sync Conflicts list says it plainly: "Two devices edited the same value; the newer edit won. The replaced value is kept here until you dismiss it."

| What changed on two computers | What happens |
| - | - |
| A Brain's name | Newer edit wins. The replaced name is kept in Sync Conflicts. |
| A chat's title | Newer edit wins. The replaced title is kept in Sync Conflicts. |
| Which Brains a chat uses (its scope) | Newer edit wins. The replaced scope is kept in Sync Conflicts. |
| Documents added on both computers | No conflict. Both are kept. |
| Questions and answers in chats | No conflict. Every message is kept. |
| Something deleted on one computer and still present on another that was offline | It stays deleted. A computer coming back online does not bring it back. |

Every computer applies the same rule in the same order, so they all end up with the same result without asking you.

## Troubleshooting

<AccordionGroup>
  <Accordion title="Two devices sent the same change at once">
    If the Sync pane shows "Two devices sent the same change at once. Elephas will try again.", wait. Elephas retries on its own.
  </Accordion>

  <Accordion title="Something I deleted came back, or a change didn't arrive">
    Check that both computers show **Up to date** and **Nothing is waiting to leave this computer.** Then see [Sync troubleshooting](/docs/troubleshooting/sync-troubleshooting).
  </Accordion>
</AccordionGroup>

## Related articles

<CardGroup cols={2}>
  <Card title="Sync while offline" href="/docs/sync-and-devices/sync-offline" />

  <Card title="What syncs" href="/docs/sync-and-devices/what-syncs" />

  <Card title="Personal Sync overview" href="/docs/sync-and-devices/personal-sync-overview" />

  <Card title="Sync troubleshooting" href="/docs/troubleshooting/sync-troubleshooting" />
</CardGroup>


This documentation is built and hosted on [Mintlify](https://mintlify.com), a developer documentation platform.