diff --git a/.obsidian/workspace b/.obsidian/workspace
index 42485fee0..2e0cec427 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -96,7 +96,7 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "frenemy.md",
+                "file": "2021-05-28.md",
                 "mode": "source"
               }
             }
@@ -280,7 +280,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "subtext.md",
+                "file": "2021-05-28.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -297,7 +297,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "subtext.md"
+                "file": "2021-05-28.md"
               }
             }
           },
@@ -330,17 +330,17 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "81312818f4299cce",
+  "active": "337a1c686e22dffb",
   "lastOpenFiles": [
-    "subtext.md",
     "2021-05-28.md",
+    "frenemy.md",
+    "subtext.md",
     "⚒.md",
     "tools for thought interchange.md",
     "knowledge garden overview.md",
     "2021-05-27.md",
     "governing the commons.md",
     "webminar mode.md",
-    "young wizards.md",
-    "conflict-files-obsidian-git.md"
+    "young wizards.md"
   ]
 }
\ No newline at end of file
diff --git a/2021-05-28.md b/2021-05-28.md
index bc6756bf6..452160a75 100644
--- a/2021-05-28.md
+++ b/2021-05-28.md
@@ -1 +1,4 @@
-- [[subtext]]
\ No newline at end of file
+- [[subtext]]
+- [[agora]]
+	- [[vera]]
+		- [[git submodules]] might be making a comeback :)
\ No newline at end of file
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index c8ba493b9..000000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Conflict files
-Please resolve them and commit per command (This file will be deleted before the commit).
-- Not a file: .obsidian/workspace
\ No newline at end of file