From 17972daf23b4f0243152da7318917d56f93c2c17 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Wed, 20 Jan 2021 18:14:20 +0100
Subject: [PATCH] Auto: misc.

---
 boris-mann.md | 1 +
 mind-merge.md | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 mind-merge.md

diff --git a/boris-mann.md b/boris-mann.md
index d91ebf552..c338b7311 100644
--- a/boris-mann.md
+++ b/boris-mann.md
@@ -50,6 +50,7 @@
 - [[agora protocol]] for [[social discovery]]
   - [[chicken fingers vs tentacles]]
 - the [[agora]] is a [[tool for building shared context]]
+  - [[mind merge]]
 - [[stoa]] is a [[shared context]] with explicit [[goals]], [[values]] and [[biases]].
   - a [[data structure]] plus a [[social graph]] that is geared towards [[solving problem]].
   - a [[squad]] is a collection of [[people]] with a set of [[skills]] coming together to work on a [[task]] or accomplish a [[goal]].
diff --git a/mind-merge.md b/mind-merge.md
new file mode 100644
index 000000000..5b02b7dbe
--- /dev/null
+++ b/mind-merge.md
@@ -0,0 +1,4 @@
+# Mind Merge
+
+- A [[tool]] or [[process]] that allows a set of people to optimally build a shared context.
+