diff --git a/.obsidian/plugins/longform/data.json b/.obsidian/plugins/longform/data.json
index c8d970f6..9ee5c03e 100644
--- a/.obsidian/plugins/longform/data.json
+++ b/.obsidian/plugins/longform/data.json
@@ -8,5 +8,45 @@
     }
   },
   "selectedProject": "04.03 Creative snippets",
-  "selectedDraft": "Draft 1"
+  "selectedDraft": "Draft 1",
+  "userScriptFolder": null,
+  "workflows": {
+    "Default Workflow": {
+      "name": "Default Workflow",
+      "description": "A starter workflow. Feel free to edit, rename, or delete it and create your own.",
+      "steps": [
+        {
+          "id": "strip-frontmatter",
+          "optionValues": {}
+        },
+        {
+          "id": "remove-links",
+          "optionValues": {
+            "remove-wikilinks": true,
+            "remove-external-links": true
+          }
+        },
+        {
+          "id": "prepend-title",
+          "optionValues": {
+            "format": "## $1",
+            "separator": "\n\n"
+          }
+        },
+        {
+          "id": "concatenate-text",
+          "optionValues": {
+            "separator": "\\n\\n---\\n\\n"
+          }
+        },
+        {
+          "id": "write-to-note",
+          "optionValues": {
+            "target": "manuscript.md",
+            "open-after": true
+          }
+        }
+      ]
+    }
+  }
 }
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-activity-history/data.json b/.obsidian/plugins/obsidian-activity-history/data.json
index 49b39b7f..8119c961 100644
--- a/.obsidian/plugins/obsidian-activity-history/data.json
+++ b/.obsidian/plugins/obsidian-activity-history/data.json
@@ -13,7 +13,7 @@
     {
       "path": "/",
       "date": "2022-08-31",
-      "size": 6876717
+      "size": 6876730
     }
   ],
   "activityHistory": [
@@ -954,7 +954,7 @@
         },
         {
           "date": "2022-08-31",
-          "value": 7626
+          "value": 7639
         }
       ]
     }
diff --git a/.obsidian/workspace b/.obsidian/workspace
index 32d412e5..ce01a88e 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -9,7 +9,7 @@
         "state": {
           "type": "markdown",
           "state": {
-            "file": "01.02 Home/@Main Dashboard.md",
+            "file": "05.01 Computer setup/Git.md",
             "mode": "preview",
             "source": false
           }
@@ -19,157 +19,156 @@
     "direction": "vertical"
   },
   "left": {
-    "id": "f074102039f2fcaa",
-    "type": "mobile-drawer",
+    "id": "53371cd0730d95ea",
+    "type": "split",
     "children": [
       {
-        "id": "1f6a6b4151d812b3",
-        "type": "leaf",
-        "state": {
-          "type": "file-explorer",
-          "state": {}
-        }
-      },
-      {
-        "id": "4e46ae5bf975f6c1",
-        "type": "leaf",
-        "state": {
-          "type": "search",
-          "state": {
-            "query": "",
-            "matchingCase": false,
-            "explainSearch": false,
-            "collapseAll": false,
-            "extraContext": false,
-            "sortOrder": "alphabetical"
-          }
-        }
-      },
-      {
-        "id": "f2f6c9b29ed65fd4",
-        "type": "leaf",
-        "state": {
-          "type": "tag",
-          "state": {
-            "sortOrder": "frequency",
-            "useHierarchy": true
+        "id": "a6b2452d103625c7",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "0ce04333af2d656e",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {}
+            }
+          },
+          {
+            "id": "98533ebad14539b4",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              }
+            }
+          },
+          {
+            "id": "6f8b0e456663d16b",
+            "type": "leaf",
+            "state": {
+              "type": "VIEW_TYPE_LONGFORM_EXPLORER",
+              "state": {}
+            }
           }
-        }
-      },
-      {
-        "id": "c4b207c5aa35ba04",
-        "type": "leaf",
-        "state": {
-          "type": "VIEW_TYPE_LONGFORM_EXPLORER",
-          "state": {}
-        }
+        ]
       }
     ],
-    "currentTab": 0
+    "direction": "horizontal",
+    "width": 300
   },
   "right": {
-    "id": "5aad8a4c68b0a22e",
-    "type": "mobile-drawer",
+    "id": "da14561e42d2c024",
+    "type": "split",
     "children": [
       {
-        "id": "f7776a9d170a0f9f",
-        "type": "leaf",
-        "state": {
-          "type": "backlink",
-          "state": {
-            "file": "01.02 Home/@Main Dashboard.md",
-            "collapseAll": false,
-            "extraContext": false,
-            "sortOrder": "alphabetical",
-            "showSearch": false,
-            "searchQuery": "",
-            "backlinkCollapsed": false,
-            "unlinkedCollapsed": false
+        "id": "b617a2eefbf0107c",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "ec0cecef4784027f",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "05.01 Computer setup/Git.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              }
+            }
+          },
+          {
+            "id": "22e67ef1cafccdf2",
+            "type": "leaf",
+            "state": {
+              "type": "outgoing-link",
+              "state": {
+                "file": "05.01 Computer setup/Git.md",
+                "linksCollapsed": false,
+                "unlinkedCollapsed": true
+              }
+            }
+          },
+          {
+            "id": "dd32c1b6c3d52740",
+            "type": "leaf",
+            "state": {
+              "type": "tag",
+              "state": {
+                "sortOrder": "frequency",
+                "useHierarchy": true
+              }
+            }
+          },
+          {
+            "id": "9baa36d4a5a4f608",
+            "type": "leaf",
+            "state": {
+              "type": "DICE_ROLLER_VIEW",
+              "state": {}
+            }
+          },
+          {
+            "id": "5e6754bf8ce5cc60",
+            "type": "leaf",
+            "state": {
+              "type": "hackernews-view",
+              "state": {}
+            }
+          },
+          {
+            "id": "344629b024b94758",
+            "type": "leaf",
+            "state": {
+              "type": "reminder-list",
+              "state": {}
+            }
+          },
+          {
+            "id": "a4f979eabb9d755f",
+            "type": "leaf",
+            "state": {
+              "type": "online.tokuhirom.obsidian-stopwatch-plugin",
+              "state": {}
+            }
+          },
+          {
+            "id": "61cb879fa1e25227",
+            "type": "leaf",
+            "state": {
+              "type": "podcast_player_view",
+              "state": {}
+            }
           }
-        }
-      },
-      {
-        "id": "e912968a094a8dbe",
-        "type": "leaf",
-        "state": {
-          "type": "outgoing-link",
-          "state": {
-            "file": "01.02 Home/@Main Dashboard.md",
-            "linksCollapsed": false,
-            "unlinkedCollapsed": false
-          }
-        }
-      },
-      {
-        "id": "b97781c9415c1b78",
-        "type": "leaf",
-        "state": {
-          "type": "hackernews-view",
-          "state": {}
-        }
-      },
-      {
-        "id": "a64402126e020fab",
-        "type": "leaf",
-        "state": {
-          "type": "online.tokuhirom.obsidian-stopwatch-plugin",
-          "state": {}
-        }
-      },
-      {
-        "id": "0a9128e6906fd0b4",
-        "type": "leaf",
-        "state": {
-          "type": "RSS_FEED",
-          "state": {}
-        }
-      },
-      {
-        "id": "c8e3e73aa58f1fd8",
-        "type": "leaf",
-        "state": {
-          "type": "advanced-tables-toolbar",
-          "state": {}
-        }
-      },
-      {
-        "id": "7780204a63e8a6d2",
-        "type": "leaf",
-        "state": {
-          "type": "reminder-list",
-          "state": {}
-        }
-      },
-      {
-        "id": "b069f500d88e39cb",
-        "type": "leaf",
-        "state": {
-          "type": "podcast_player_view",
-          "state": {}
-        }
-      },
-      {
-        "id": "ad0945235fa35655",
-        "type": "leaf",
-        "state": {
-          "type": "DICE_ROLLER_VIEW",
-          "state": {}
-        }
+        ],
+        "currentTab": 4
       }
     ],
-    "currentTab": 2
+    "direction": "horizontal",
+    "width": 300
   },
   "active": "810e155ef7f6612e",
   "lastOpenFiles": [
+    "05.01 Computer setup/Nextcloud.md",
+    "05.01 Computer setup/Jellyfin.md",
+    "05.01 Computer setup/Git.md",
     "01.02 Home/@Main Dashboard.md",
     "01.02 Home/@Shopping list.md",
     "00.01 Admin/Test sheet.md",
-    "05.01 Computer setup/Jellyfin.md",
-    "05.01 Computer setup/Nextcloud.md",
     "05.01 Computer setup/NextDNS.md",
     "05.02 Networks/Server Cloud.md",
     "03.02 Travels/Geneva.md",
-    "05.02 Networks/Configuring UFW.md",
-    "05.02 Networks/Configuring Fail2ban.md"
+    "05.02 Networks/Configuring UFW.md"
   ]
 }
\ No newline at end of file
diff --git a/05.01 Computer setup/Git.md b/05.01 Computer setup/Git.md
index dc8c4af1..8c1a1da5 100644
--- a/05.01 Computer setup/Git.md	
+++ b/05.01 Computer setup/Git.md	
@@ -105,7 +105,7 @@ a few actions can be initiated:
 ~~~
 git pull (--rebase) (optional: 'remote name' 'branche name')
 or
-git fetch
+git fetch && git merge
 ~~~
 ```