diff --git a/journal/2021-10-09.md b/journal/2021-10-09.md
index 53c09f09d..18646d435 100644
--- a/journal/2021-10-09.md
+++ b/journal/2021-10-09.md
@@ -1,10 +1,7 @@
 # 2021-10-09
 
-<<<<<<< HEAD
 - would you like to [[know]] me?
-=======
 - [[imageflow]]
   - recommended by [[codex]]
 - [[good rogues]]
-- [[counter anti disintermediation]]
->>>>>>> 12675e316d89c55811f833e25c070afcb763b171
+- [[counter anti disintermediation]]
\ No newline at end of file