# How to resolve conflicts?

**URL:** <https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197>\
**Category:** Support\
**Created:** [16 April 2022 13:14 UTC](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197 "2022-04-16T13:14:11Z")\
**Posts on this page:** 1\
**Showing post:** 2

<div class="post-metadata">

**Author:** ![MrKanister](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/mrkanister/32/20054_2.png) [@MrKanister](https://discourse.joplinapp.org/u/MrKanister)\
**Post date:** [25 April 2022 19:57 UTC](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197/2 "2022-04-25T19:57:16Z")

</div>

On desktop there is a plugin `Conflict Resolution` available to check the differences and merge them:

> [@Plugin: Conflict Resolution](https://discourse.joplinapp.org/t/plugin-conflict-resolution/19204):
>
> Conflict Resolution Plugin This is the goto-plugin for whenever you're facing conflict issues! It'll provide a nice diff-window in which you can see the differences between your current note and the note received from cloud. How to use After you have a conflict note, you can simply right click the note in the conflicts folder and then you'll see a new button called Resolve Conflict. Pressing it will open the diff-window. In the case of using the plugin on an old conflict, the plugi…

---

_[View the full topic](https://discourse.joplinapp.org/t/how-to-resolve-conflicts/25197)._