diff --git a/dyokomizo.md b/dyokomizo.md
index 64d874a70..8ec67fdaa 100644
--- a/dyokomizo.md
+++ b/dyokomizo.md
@@ -1,17 +1,17 @@
 # Dyokomizo
 
-- A [[person]], mostly.
-  - Self describes as "human being, most of the time"
-- [[twitter]]. Zen practitioner. Programmer/tech worker. Brazilian.
-    - Good overlap.
-- [[doc]] https://flancia.org/go/dyokomizo-flancian
-- [[medium]] https://medium.com/@dyokomizo 
-- [[review]] https://www.reddit.com/r/BlackSwanDAO/comments/iisf5o/initial_draft_of_new_governance_documents/
-- [[meditation]] https://docs.google.com/document/d/1ptGnu-hbEFOXKCrYlL1hsaG12CJfl2yGHyy0GtOvWfc/edit
-    - guided meditations of __Tara__Brach: https://www.tarabrach.com/guided-meditations/ 
-- Told me about [[implementation intention]] 
-- [[blag]] https://github.com/dyokomizo/blag/issues
-- One of [[explorer]] [[achiever]]
+- a [[person]].
+  - [[zen]] practitioner. [[programmer]]/tech worker. [[brazilian]].
+  - [[twitter]] https://twitter.com/dyokomizo
+    - Self describes as "human being, most of the time"
+  - [[medium]] https://medium.com/@dyokomizo 
+  - [[review]] https://www.reddit.com/r/BlackSwanDAO/comments/iisf5o/initial_draft_of_new_governance_documents/
+  - [[meditation]] https://docs.google.com/document/d/1ptGnu-hbEFOXKCrYlL1hsaG12CJfl2yGHyy0GtOvWfc/edit
+      - guided meditations of __Tara__Brach: https://www.tarabrach.com/guided-meditations/ 
+  - Told me about [[implementation intention]] 
+  - [[blag]] https://github.com/dyokomizo/blag/issues
+  - [[doc]] https://flancia.org/go/dyokomizo-flancian
+  - One of [[explorer]] [[achiever]]
   - https://twitter.com/dyokomizo/status/1312084291443097601
-- https://twitter.com/dyokomizo/status/1304416612968169472
+  - https://twitter.com/dyokomizo/status/1304416612968169472
 
diff --git a/journal/2021-11-22.md b/journal/2021-11-22.md
index 06ff996cc..70f3b931c 100644
--- a/journal/2021-11-22.md
+++ b/journal/2021-11-22.md
@@ -1,4 +1,8 @@
 # 2021-11-22
 
+<<<<<<< HEAD
+- [[dyokomizo]]
+=======
 - [[protopoi]]
-- [[arth-goldau]]
\ No newline at end of file
+- [[arth-goldau]]
+>>>>>>> 95a3576d3c9f53acb68e776aafc3de56392dbc2c
diff --git a/roko.md b/roko.md
index 23be5bf56..dd13f64c0 100644
--- a/roko.md
+++ b/roko.md
@@ -3,7 +3,7 @@
 - A [[person]].
 - [[author]] [[pull]] [[rokos basilisk]]
 - [[pull]] [[roko mijic]] [[rokomijikuk]]
-- [[twitter]] twitter.com/rokomijikuk
+- [[twitter]] twitter.com/rokomijic
 - Strong opions, I often disagree with him but find him [[interesting]].