diff --git a/flancia meet.md b/flancia meet.md
index c7689b78b..3cf896486 100644
--- a/flancia meet.md	
+++ b/flancia meet.md	
@@ -2,10 +2,7 @@
 
 - a [[space]].
   - [[go]] https://meet.jit.si/flancia-meet- 0-pBBbbu0-,blt
-- [[take it easy
-- [[push]] [[nft
-  - [[eip 721]] 
-      - or just [[pull]] the jitsi stoa in this node :)
+  - or just [[pull]] the jitsi stoa in this node :)
 
 ## [[2022-01-15]]
 - [[transcriptions]]
diff --git a/journal/2022-01-21.md b/journal/2022-01-21.md
index 9d660e54d..360d5b541 100644
--- a/journal/2022-01-21.md
+++ b/journal/2022-01-21.md
@@ -15,11 +15,10 @@
     - perhaps auto pull even?
 - [[hypothesis]]
 - [[free, fair and alive]]
-<<<<<<< HEAD
   - discussed [[patterns]], how to link them, how to assemble them into an index/[[repository pattern]]
 - [[mike hales]]
 - [[2022-01]]
-=======
 - [[everything2]]
 - [[aral]]
->>>>>>> e3f72c92fd8b726a34efc71621577b9674e7d785
+- [[flancia space]]
+- [[flancia meet]]