--- title: "Conflicts" slug: "conflicts" updated: 2022-11-24T10:37:55Z published: 2022-11-24T10:37:55Z canonical: "help.pillir.io/conflicts" --- > ## Documentation Index > Fetch the complete documentation index at: https://help.pillir.io/llms.txt > Use this file to discover all available pages before exploring further. # Conflicts ## Steps to Resolve Conflicts To resolve conflicts, the administrator can do the following: 1. From the Console tab, click **Conflicts**.![Console-conflicts](https://cdn.document360.io/718af901-247b-46be-8ace-83da21839237/Images/Documentation/Console-conflicts.png) 2. Select a row and click the **ellipsis menu**. Two options are displayed:![ellipsis menu](https://cdn.document360.io/718af901-247b-46be-8ace-83da21839237/Images/Documentation/ellipsis%20menu.png) 3. Click **Resolve** to open a popup window. Here the admin can select whether the device data(update of 2nd user) or the server data(1st user update) must be retained. If the server data is retained, the updates done by the 2nd user is overridden and vice versa. Alternatively, the admin can also choose to retain some data from device and some data from the server. ![resolveconflict-popup-newone](https://cdn.document360.io/718af901-247b-46be-8ace-83da21839237/Images/Documentation/resolveconflict-popup-newone.png) 4. Click **View** to view the conflict details along with the generated hash value.![ConflictDetails](https://cdn.document360.io/718af901-247b-46be-8ace-83da21839237/Images/Documentation/ConflictDetails.png)