docs: addd assets for merge conflict help file

Signed-off-by: Muhammad Ali <alihamuh@gmail.com>

docs/help/contents/merge-conflicts.md

@@ -1,9 +1,63 @@
+---
+title: Merge Conflicts
+description: Merge conflicts occur when there are conflicting note edits on different devices for the same note.
+---
+
 # Merge Conflicts
 
-Merge conflicts occur when there are conflicting note edits on your devices for the same note. 
+## Why Merge Conflicts occur?
 
-Lets suppose that you have two devices running Notesnook: 1. a desktop and 2. a mobile. Suppose that one of your devices is offline (in this case your mobile phone). Now if you make edits to the same note on both your devices and then synched them both a merge conflict will occur. 
+Merge conflicts occur when there are conflicting note edits on different devices for the same note.
 
+## How Merge Conflicts occur?
 
+Lets suppose that you have two devices running Notesnook:
 
+1. A desktop
+2. A mobile device
 
+Suppose that one of your devices is offline. Now if you made edits to one of your (same)notes on both your devices and **synched changes** a merge conflict will occur.
+
+> info
+>
+> In order for a merge conflict to occur the changes on the (same)note on both devices should occur in more than a minute
+
+## Where do Merge conflicts show
+
+The conflicted notes appear at the very top of the notes list. Just navigate to the Notes page and you will see them right away (If there are any).
+
+## How to Resolve Merge Conflicts
+
+# [Desktop/Web](#/tab/web)
+
+Follow these steps to resolve a Merge Conflict:
+
+1. Go to the conflicted note. It appears at the top of your note list.
+2. Open the note. This will take you to a conflict resolution screen.
+3. On the conflict resolution screen two versions of your note will appear side by side. One will be from the device you are using (Current Note) and one will be from the server(Incomming Note).
+
+![](/merge-conflicts-1.png)
+
+4. Go through both versions and choose which one you want to keep.
+5. Press the Keep button on the note you want to keep.
+6. Press Discard button on the note you don't want to keep (you can also press the Save a Copy button if you want to keep it too).
+
+![](/merge-conflicts-2.png)
+
+# [Mobile](#/tab/mobile)
+
+Follow these steps to resolve a Merge Conflict:
+
+1. Go to the conflicted note. It appears at the top of your note list.
+2. Open the note. This will take you to a conflict resolution screen.
+3. On the Coflict Resolution Screen 2 versions of your note will appear above and below. One will be from the device you are using (Current Note) and one will be from the server(Incomming Note).
+
+<img src="/merge-conflicts-mobile-1.png" alt="drawing" width="414" style="text-align:center"/>
+
+4. Go through both versions and choose which one you want to keep.
+5. Press the Keep button on the note you want to keep.
+6. And Discard button on the note you don't want to keep (you can also press the Save a Copy button if you want to keep it too).
+
+<img src="/merge-conflicts-mobile-2.png" alt="drawing" width="414"/>
+
+---

docs/help/docgen.yaml

@@ -79,3 +79,4 @@ navigation:
       - path: custom-themes/create-a-theme-with-theme-builder.md
       - path: custom-themes/install-a-theme-from-file.md
       - path: custom-themes/publish-a-theme.md
+  - path: merge-conflicts.md