diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json
index 1a10072..d2cf598 100644
--- a/Edikoyo/.obsidian/workspace.json
+++ b/Edikoyo/.obsidian/workspace.json
@@ -66,9 +66,20 @@
                 "source": false
               }
             }
+          },
+          {
+            "id": "e18161b255f8c3cb",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "Edikoyo/.obsidian/workspace.json",
+                "staged": false
+              }
+            }
           }
         ],
-        "currentTab": 4
+        "currentTab": 5
       }
     ],
     "direction": "vertical"
@@ -134,7 +145,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Animals/Slimes/Ababa Slime.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -151,7 +161,6 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Animals/Slimes/Ababa Slime.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -173,9 +182,7 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {
-                "file": "Animals/Slimes/Ababa Slime.md"
-              }
+              "state": {}
             }
           },
           {
@@ -203,14 +210,14 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "a12c575a3e4e2f21",
+  "active": "e18161b255f8c3cb",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "Animals/Slimes/Ababa Slime.md",
     "Animals/_index.md",
     "Animals/Slimes/_index.md",
-    "Animals/Slimes/Ababa Slime.md",
     "Test One.md",
     "Animals/Slimes/Test.md",
-    "conflict-files-obsidian-git.md",
     "Animals/Cat.md",
     "Animals/Dog.md",
     "Countries/_index.md",
diff --git a/Edikoyo/Animals/Slimes/_index.md b/Edikoyo/Animals/Slimes/_index.md
index 321f356..2e2cbb0 100644
--- a/Edikoyo/Animals/Slimes/_index.md
+++ b/Edikoyo/Animals/Slimes/_index.md
@@ -1,2 +1,2 @@
 
-Ababa Slime
\ No newline at end of file
+[[Ababa Slime]]
\ No newline at end of file
diff --git a/content/Animals/Slimes/_index.md b/content/Animals/Slimes/_index.md
index 88d6863..75784f0 100644
--- a/content/Animals/Slimes/_index.md
+++ b/content/Animals/Slimes/_index.md
@@ -1,4 +1,4 @@
 ---
 ---
 
-Ababa Slime
+[Ababa Slime](Ababa%20Slime.md)
diff --git a/content/conflict-files-obsidian-git.md b/content/conflict-files-obsidian-git.md
new file mode 100644
index 0000000..f44af68
--- /dev/null
+++ b/content/conflict-files-obsidian-git.md
@@ -0,0 +1,22 @@
+---
+---
+
+# Conflicts
+
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[Additional Instructions](conflict-files-obsidian-git.md#additional-instructions) available below file list
+
+* Not a file: Edikoyo/.obsidian/workspace.json
+
+# 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
+````