diff --git a/.obsidian/workspace b/.obsidian/workspace
index d641ca598..237e57235 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -50,6 +50,50 @@
           {
             "id": "fb71ba983a9beb7e",
             "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "2021-05-31.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "56eed9af91cd346a",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "2021-05-31.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "45b6723ed9ad463c",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "branching chess.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "8acbd285e20a4eff",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "wong kar wai.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "1a06faffd6b653c8",
+            "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
@@ -58,6 +102,17 @@
               }
             }
           },
+          {
+            "id": "faa302f9ef23d4ed",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source"
+              }
+            }
+          },
           {
             "id": "68e81b5f03f48b15",
             "type": "split",
@@ -175,7 +230,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "chunking express.md",
+                "file": "branching chess.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -192,7 +247,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "chunking express.md"
+                "file": "branching chess.md"
               }
             }
           }
@@ -203,17 +258,17 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "fb71ba983a9beb7e",
+  "active": "45b6723ed9ad463c",
   "lastOpenFiles": [
+    "branching chess.md",
+    "2021-05-31.md",
+    "photoprism.md",
     "chunking express.md",
+    "wong kar wai.md",
+    "conflict-files-obsidian-git.md",
     "2021-05-30.md",
     "flancia collective.md",
     "patterns.md",
-    "2021-05-28.md",
-    "2021-05-27.md",
-    "reading alexander.md",
-    "tooty.md",
-    "agora editor.md",
-    "gardens.yaml.md"
+    "2021-05-28.md"
   ]
 }
\ No newline at end of file
diff --git a/2021-05-31.md b/2021-05-31.md
new file mode 100644
index 000000000..3bd826c28
--- /dev/null
+++ b/2021-05-31.md
@@ -0,0 +1,3 @@
+- [[open source]] [[google photos]]
+	- [[photoprism]]
+- [[branching chess]]
\ No newline at end of file
diff --git a/branching chess.md b/branching chess.md
new file mode 100644
index 000000000..07538fd53
--- /dev/null
+++ b/branching chess.md	
@@ -0,0 +1,4 @@
+- a [[chess variant]]
+	- it surely must exist already but I haven't found it, probably a matter of finding the right name
+	
+https://twitter.com/flancian/status/1399409547492704256
\ No newline at end of file
diff --git a/chunking express.md b/chunking express.md
index 34b7aeff9..1f4a0dead 100644
--- a/chunking express.md	
+++ b/chunking express.md	
@@ -3,4 +3,7 @@
 	- one of my favourites
 	- [[go]] https://www.youtube.com/watch?v=MH38QAN80vs
 
-https://twitter.com/flancian/status/1399002943425232902
\ No newline at end of file
+<<<<<<< HEAD
+https://twitter.com/flancian/status/1399002943425232902
+=======
+>>>>>>> ccd3b91b49fec637a106ba636501453785014f1c
diff --git a/photoprism.md b/photoprism.md
new file mode 100644
index 000000000..4da8faed9
--- /dev/null
+++ b/photoprism.md
@@ -0,0 +1,3 @@
+- a [[google photos]] [[alternative]]
+	- [[go]] [[git]]
+	- [[git]] https://github.com/photoprism/photoprism
\ No newline at end of file
diff --git a/wong kar wai.md b/wong kar wai.md
index 8c43db639..a0f040bf6 100644
--- a/wong kar wai.md	
+++ b/wong kar wai.md	
@@ -2,5 +2,5 @@
 
 - A [[person]].
 - [[film]] [[director]].
-- My favourite movie of his is either [[happy together]] or [[in the mood for love]].
+- I've seen [[happy together]], [[in the mood for love]], [[chunking express]].