Changed 2 files.

Affected files:
README.md
example_conflict-files-obsidian-git.md

README.md

@@ -37,9 +37,20 @@ t --> s
 ### Git sync plugin in Obsidian
 This text has been commited and pushed via the Obsidian git plugin. Keep in mind that on windows, this can only be done if the repository is cloned via HTTPS, not SSH cert.
 
+This is what a conflict looks like:
+```
+<<<<<<< HEAD
 This text is changed via Obsidian. At the same time, there is a change online.
+=======
+This text is added online. At the same time, there is a change in Obsidian.
+>>>>>>> origin/main
+```
+When you pull and there are merge conflicts, the plugin will open an overview page with all the conflicts listed. You can correct them, then you should push all changes immediately. The overview page may look like [this](example_conflict-files-obsidian-git.md).
 
 ---
+
+There may also be non-conflicting changes, such as this.
+
 ## Getting started
 
 To make it easy for you to get started with GitLab, here's a list of recommended next steps.

example_conflict-files-obsidian-git.md

+# Conflicts
+Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- [[README]]
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```
\ No newline at end of file