diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index 11ea376..29e0cb3 100644
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -17,6 +17,6 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
-  "scale": 1.392484646488363,
+  "scale": 0.9932251304186369,
   "close": false
 }
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index a3e8976..4baf453 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,7 +20,7 @@
             }
           },
           {
-            "id": "1ba1e069ad24e3d0",
+            "id": "0caab52aafa99b83",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -43,6 +43,18 @@
               }
             }
           },
+          {
+            "id": "d99b794fb30ad2d4",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
           {
             "id": "eab11d225abaf8a7",
             "type": "leaf",
@@ -80,7 +92,7 @@
             }
           }
         ],
-        "currentTab": 1
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -146,7 +158,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Geschäft/Etiketten/Drucken/01 - Drucken.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -163,7 +175,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Geschäft/Etiketten/Drucken/01 - Drucken.md",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -186,7 +198,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Geschäft/Etiketten/Drucken/01 - Drucken.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -239,16 +251,17 @@
       "obsidian-excalidraw-plugin:Create new drawing": false
     }
   },
-  "active": "1ba1e069ad24e3d0",
+  "active": "d99b794fb30ad2d4",
   "lastOpenFiles": [
     "Geschäft/Etiketten/Drucken/03 - Gedruckt & Geschnitten.md",
+    "conflict-files-obsidian-git.md",
     "Geschäft/Etiketten/Drucken/01 - Drucken.md",
     "ToDo's/ToDo's.md",
+    "HomeLab/Linux Befehle.md",
     "Bank.md",
     "HomeLab/VPS/Screen.md",
     "Geschäft/IT/Postgres.md",
     "Programmieren/Spicy Storage/01 - ToDo's - Verbesserungen.md",
-    "HomeLab/Linux Befehle.md",
     "HomeLab/VPS/Nextcloud.md",
     "HomeLab/VPS/Rust Desk.md",
     "HomeLab/VPS/Headscale.md",
@@ -271,7 +284,6 @@
     "Ausbildung/MJU.md",
     "Ausbildung",
     "HomeLab/Untitled",
-    "HomeLab/Rose/Minecraft Server.md",
     "Geschäft/Gewürze/attachments/2420032101MB - Angebot Districap - Ninon Mix - Lodner Gewürze.pdf",
     "Geschäft/Gewürze/attachments",
     "3D Druck/Projekte/Geschäft/Küche",
diff --git a/.trash/conflict-files-obsidian-git 2.md b/.trash/conflict-files-obsidian-git 2.md
new file mode 100644
index 0000000..4554b3a
--- /dev/null
+++ b/.trash/conflict-files-obsidian-git 2.md	
@@ -0,0 +1,19 @@
+# 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]] available below file list
+
+- Not a file: .obsidian/workspace.json
+- [[01 - Drucken]]
+- [[Linux Befehle]]
+
+# 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
diff --git a/.trash/conflict-files-obsidian-git 3.md b/.trash/conflict-files-obsidian-git 3.md
new file mode 100644
index 0000000..4554b3a
--- /dev/null
+++ b/.trash/conflict-files-obsidian-git 3.md	
@@ -0,0 +1,19 @@
+# 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]] available below file list
+
+- Not a file: .obsidian/workspace.json
+- [[01 - Drucken]]
+- [[Linux Befehle]]
+
+# 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
diff --git a/.trash/conflict-files-obsidian-git.md b/.trash/conflict-files-obsidian-git.md
new file mode 100644
index 0000000..4554b3a
--- /dev/null
+++ b/.trash/conflict-files-obsidian-git.md
@@ -0,0 +1,19 @@
+# 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]] available below file list
+
+- Not a file: .obsidian/workspace.json
+- [[01 - Drucken]]
+- [[Linux Befehle]]
+
+# 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
diff --git a/Geschäft/Etiketten/Drucken/01 - Drucken.md b/Geschäft/Etiketten/Drucken/01 - Drucken.md
index 6441f46..09680f5 100644
--- a/Geschäft/Etiketten/Drucken/01 - Drucken.md	
+++ b/Geschäft/Etiketten/Drucken/01 - Drucken.md	
@@ -5,9 +5,6 @@
 - [ ] ? x Vegane Streichwurst
 - [ ] ? x Vegane Streichwurst Trüffel
 
-- [ ] 625 x Käfer Rinder Bolognese S. 2
-- [ ] 186 x Käfer Fischfond S. 9
-
 ---
 ## Gewürze:
 
@@ -17,9 +14,6 @@
 78g für Kraftpapier
 66g für Schwarz
 
-
-
-
 ---
 ## Hotel:
 
diff --git a/Geschäft/Etiketten/Drucken/03 - Gedruckt & Geschnitten.md b/Geschäft/Etiketten/Drucken/03 - Gedruckt & Geschnitten.md
index 5fa577a..ab5621f 100644
--- a/Geschäft/Etiketten/Drucken/03 - Gedruckt & Geschnitten.md	
+++ b/Geschäft/Etiketten/Drucken/03 - Gedruckt & Geschnitten.md	
@@ -9,6 +9,8 @@
 
 ---
 
+- [ ] 625 x Käfer Rinder Bolognese S. 2
+- [x] 186 x Käfer Fischfond S. 9 ✅ 2024-08-01
 ---
 - [x] 104 x Käfer Rehragout S. 15 ✅ 2024-07-31
 - [x] 186 x Käfer Fischfond S. 9 ✅ 2024-07-31