diff --git a/journal/2021-12-30.md b/journal/2021-12-30.md
index b62718c85..2dfc7d573 100644
--- a/journal/2021-12-30.md
+++ b/journal/2021-12-30.md
@@ -1,12 +1,5 @@
 # 2021-12-30
 
-<<<<<<< HEAD
-- [[commons]]
-  - [[knowledge commons]]
-    - [[digital commons]]
-  - [[markets]]
-- [[singularity]]
-=======
 - [[zk]]
 - [x] [[work]]
 - [x] [[flancia]]
@@ -19,4 +12,13 @@
 - [[push]] [[barón biza]]
   - [[jorge barón biza]]
   - born [[1942]]
->>>>>>> a2f48d2b0f74973792b225f33a3793a84fc11440
+- [[commons]]
+  - [[knowledge commons]]
+    - [[digital commons]]
+  - [[markets]]
+- [[push]] [[singularity]]
+  - got reminded of the [[singularity church]] in [[deus ex]]
+  - turns out there is a [[church of the singularity]]
+    - also:
+      - [[church of the simulation]]
+      - [[church of earth]]
diff --git a/simulation.md b/simulation.md
index 43b3cf173..0ab4c8e8d 100644
--- a/simulation.md
+++ b/simulation.md
@@ -4,5 +4,6 @@
   - [[hypothesis]].
     - we are [[computational]] [[processes]].
   - [[pull]] [[david deutsch]] [[max tegmark]] [[nick bostrom]] [[dust universe theory]]
+