diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index d42cdeb..9f340c9 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "Active Directory Basics"
             }
+          },
+          {
+            "id": "d563e5b87c2bf0a1",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "obsidian.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "obsidian"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -173,8 +188,8 @@
             "state": {
               "type": "git-view",
               "state": {},
-              "icon": "lucide-ghost",
-              "title": "git-view"
+              "icon": "git-pull-request",
+              "title": "Source Control"
             }
           }
         ],
@@ -182,8 +197,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
+    "width": 300
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -198,11 +212,13 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "2dff01bd208bbc21",
+  "active": "1973c33e0bd53ded",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "obsidian.md",
+    "cybersec/AD/Active Directory Basics.md",
     "cybersec/AD/AD.md",
     "cybersec/Network/tcpdump.md",
-    "cybersec/AD/Active Directory Basics.md",
     "cybersec/Network/Wireshark.md",
     "cybersec/Network/photoes/wire7.gif",
     "cybersec/Network/photoes/wire6t.gif",
@@ -235,9 +251,7 @@
     "cybersec/_Index_of_cybersec.md",
     "cybersec/Network/_Index_of_Network.md",
     "cybersec/Network/DHCP.md",
-    "cybersec/Network/Протоколы/DNS.md",
     "cybersec/Network/Протоколы",
-    "cybersec/OS/Bash commands.md",
     "Без названия.canvas",
     "Без названия 1.canvas",
     "English/homework"
diff --git a/Pasted image 20260831233617.png b/Pasted image 20260831233617.png
deleted file mode 100644
index 61c13b8..0000000
Binary files a/Pasted image 20260831233617.png and /dev/null differ
diff --git a/obsidian.md b/obsidian.md
index 3157ae2..9951b15 100644
--- a/obsidian.md
+++ b/obsidian.md
@@ -1,4 +1,5 @@
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
+ [[conflict-files-obsidian-git|conflict-files-obsidian-git]]
  [[cybersec/cybersec|cybersec]]
  [[English/English|English]]
  [[L1/L1|L1]]