diff --git a/.obsidian/config b/.obsidian/config
index 7824e8c32..cc6afa826 100644
--- a/.obsidian/config
+++ b/.obsidian/config
@@ -1 +1 @@
-{"pluginEnabledStatus":{"file-explorer":true,"global-search":true,"switcher":true,"graph":true,"backlink":true,"command-palette":true,"markdown-importer":true,"word-count":true,"open-with-default-app":true,"file-recovery":true,"daily-notes":true,"templates":true,"random-note":true,"outline":true,"audio-recorder":true,"starred":true,"page-preview":true,"tag-pane":false},"vimMode":true,"strictLineBreaks":false,"enabledPlugins":[],"hotkeys":{"daily-notes":[{"modifiers":["Alt"],"key":"D"}],"daily-notes:goto-prev":[{"modifiers":["Alt"],"key":"Y"}],"daily-notes:goto-next":[{"modifiers":["Alt"],"key":"T"}],"editor:focus-top":[{"modifiers":["Alt","Mod"],"key":"K"}],"editor:focus-bottom":[{"modifiers":["Alt","Mod"],"key":"J"}],"editor:focus-left":[{"modifiers":["Alt","Mod"],"key":"H"}],"editor:focus-right":[{"modifiers":["Alt","Mod"],"key":"L"}],"insert-template":[{"modifiers":["Alt","Mod"],"key":"T"}],"backlink:open-backlinks":[{"modifiers":["Alt","Mod"],"key":"B"}],"random-note":[{"modifiers":["Alt","Mod"],"key":"R"}],"explorer:reveal-active-file":[{"modifiers":["Alt","Mod"],"key":"N"}],"workspace:split-horizontal":[{"modifiers":["Alt","Mod"],"key":"-"}],"workspace:split-vertical":[{"modifiers":["Alt","Mod"],"key":"\\"}],"audio-recorder:start":[{"modifiers":["Alt","Mod"],"key":"A"}],"audio-recorder:stop":[{"modifiers":["Alt","Mod"],"key":"Q"}],"workspace:toggle-pin":[{"modifiers":["Alt","Mod"],"key":"P"}],"editor:open-link-in-new-leaf":[{"modifiers":["Mod"],"key":"]"}]}}
\ No newline at end of file
+{"pluginEnabledStatus":{"file-explorer":true,"global-search":true,"switcher":true,"graph":true,"backlink":true,"command-palette":true,"markdown-importer":true,"word-count":true,"open-with-default-app":true,"file-recovery":true,"daily-notes":true,"templates":true,"random-note":true,"outline":true,"audio-recorder":true,"starred":true,"page-preview":true,"tag-pane":false},"vimMode":true,"strictLineBreaks":false,"enabledPlugins":["nldates-obsidian","obsidian-git"],"hotkeys":{"daily-notes":[{"modifiers":["Alt"],"key":"D"}],"daily-notes:goto-prev":[{"modifiers":["Alt"],"key":"Y"}],"daily-notes:goto-next":[{"modifiers":["Alt"],"key":"T"}],"editor:focus-top":[{"modifiers":["Alt","Mod"],"key":"K"}],"editor:focus-bottom":[{"modifiers":["Alt","Mod"],"key":"J"}],"editor:focus-left":[{"modifiers":["Alt","Mod"],"key":"H"}],"editor:focus-right":[{"modifiers":["Alt","Mod"],"key":"L"}],"insert-template":[{"modifiers":["Alt","Mod"],"key":"T"}],"backlink:open-backlinks":[{"modifiers":["Alt","Mod"],"key":"B"}],"random-note":[{"modifiers":["Alt","Mod"],"key":"R"}],"explorer:reveal-active-file":[{"modifiers":["Alt","Mod"],"key":"N"}],"workspace:split-horizontal":[{"modifiers":["Alt","Mod"],"key":"-"}],"workspace:split-vertical":[{"modifiers":["Alt","Mod"],"key":"\\"}],"audio-recorder:start":[{"modifiers":["Alt","Mod"],"key":"A"}],"audio-recorder:stop":[{"modifiers":["Alt","Mod"],"key":"Q"}],"workspace:toggle-pin":[{"modifiers":["Alt","Mod"],"key":"P"}],"editor:open-link-in-new-leaf":[{"modifiers":["Mod"],"key":"]"}]}}
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 8cf7d90b0..c677d56d6 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -1 +1,5 @@
-{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 01:50:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:50:27 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file
+<<<<<<< HEAD
+{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 01:50:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:50:27 GMT+0200 (Central European Summer Time)"}
+=======
+{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 01:49:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:48:46 GMT+0200 (Central European Summer Time)"}
+>>>>>>> b1c5a29aa66dc3f6cd7a95c742a7ba8939874e5c
diff --git a/.obsidian/workspace b/.obsidian/workspace
index eef618e60..2f67ae561 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -76,6 +76,17 @@
                 "mode": "source"
               }
             }
+          },
+          {
+            "id": "35ece4c91a6d7710",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source"
+              }
+            }
           }
         ],
         "direction": "horizontal"
@@ -142,7 +153,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "flancia collective.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -159,7 +170,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "flancia collective.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           }
@@ -170,8 +181,9 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "895ae0e3312eece0",
+  "active": "35ece4c91a6d7710",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
     "flancia collective.md",
     "agora.md",
     "schelling point.md",
@@ -180,7 +192,6 @@
     "schelling points.md",
     "vault.md",
     "agora editor.md",
-    "meet.md",
-    "obsidian git.md"
+    "meet.md"
   ]
 }
\ No newline at end of file