diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json
index 278e9b7..ea2bbcb 100644
--- a/Edikoyo/.obsidian/workspace.json
+++ b/Edikoyo/.obsidian/workspace.json
@@ -100,9 +100,21 @@
                 "file": "Images/ababa/ababa-3.png"
               }
             }
+          },
+          {
+            "id": "950e4982a8d56b3d",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              }
+            }
           }
         ],
-        "currentTab": 7
+        "currentTab": 8
       }
     ],
     "direction": "vertical"
@@ -168,7 +180,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Images/ababa/ababa-3.png",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -185,7 +197,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Images/ababa/ababa-3.png",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -208,7 +220,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Images/ababa/ababa-3.png"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -237,11 +249,12 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "fdbd8ce5e8a10389",
+  "active": "950e4982a8d56b3d",
   "lastOpenFiles": [
+    "Images/ababa/ababa-3.png",
+    "conflict-files-obsidian-git.md",
     "Images/ababa/ababa-2.png",
     "Images/ababa/ababa-1.png",
-    "Images/ababa/ababa-3.png",
     "Images/ababa/ababa-4.png",
     "Languages/Mokrixi.md",
     "Languages/Lacelian.md",
@@ -267,7 +280,6 @@
     "Countries/Ovanos.md",
     "Countries/Mortham.md",
     "Countries/Mantine.md",
-    "Countries/Llasuki.md",
     "Images/ababa",
     "Images/slimes",
     "Countries/Faelani",
diff --git a/Edikoyo/Animals/Slimes/_index.md b/Edikoyo/Animals/Slimes/_index.md
index 6c4779a..2b1c478 100644
--- a/Edikoyo/Animals/Slimes/_index.md
+++ b/Edikoyo/Animals/Slimes/_index.md
@@ -1,11 +1,12 @@
 
 <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant", country_variant1 as "Country Variant 1", country_variant2 as "Country Variant 2", country_variant3 as "Country Variant 3" FROM "Animals/Slimes" WHERE file.name != "_index"  SORT file.name -->
-
 <!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant", country_variant1 as "Country Variant 1", country_variant2 as "Country Variant 2", country_variant3 as "Country Variant 3" FROM "Animals/Slimes" WHERE file.name != "_index"  SORT file.name -->
 
-| Slimes                                         | Variant 1                                         | Variant 2                                         | Variant 3                                         | Golden Variant                                    | Country Variant 1                   | Country Variant 2 | Country Variant 3                     |
-| ---------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ----------------------------------- | ----------------- | ------------------------------------- |
-| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | ![[ababa-4.png]] | [[Batanoka]] | Faelani           | [[Barrowmaw]] |
+| Slimes                                         | Variant 1                                         | Variant 2                                         | Variant 3                                         | Golden Variant                                    | Country Variant 1                   | Country Variant 2                 | Country Variant 3                     |
+| ---------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------- | ----------------------------------- | --------------------------------- | ------------------------------------- |
+| [[Ababa Slime]] | ![[ababa-1.png]] | ![[ababa-2.png]] | ![[ababa-3.png]] | ![[ababa-4.png]] | [[Batanoka]] | [[Faelani]] | [[Barrowmaw]] |
+| [[Animals/Slimes/Untitled.md\|Untitled]]       | \-                                                | \-                                                | \-                                                | \-                                                | \-                                  | \-                                | \-                                    |
 <!-- SerializedQuery END -->
+ 
 
 
diff --git a/content/Animals/Slimes/_index.md b/content/Animals/Slimes/_index.md
index 3d42ea9..6ce8075 100644
--- a/content/Animals/Slimes/_index.md
+++ b/content/Animals/Slimes/_index.md
@@ -6,7 +6,8 @@
 
 |Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
 |------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
-|[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\ababa\ababa-1.png)|![ababa-2.png](..\..\Images\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\ababa\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|Faelani|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
+|[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\ababa\ababa-1.png)|![ababa-2.png](..\..\Images\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\ababa\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
+|[Untitled](Untitled.md)|-|-|-|-|-|-|-|
 
 <!-- SerializedQuery END -->
 
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
+````