diff --git a/journal/2021-11-21.md b/journal/2021-11-21.md
index 7b083cdbd..b58e54880 100644
--- a/journal/2021-11-21.md
+++ b/journal/2021-11-21.md
@@ -1,8 +1,6 @@
 # 2021-11-21
 
-<<<<<<< HEAD
 - [[meitei]]
-=======
 - [[revolution]]
 - [[do]]
   - [[agora bot]]
@@ -18,6 +16,4 @@
   - [[write]]
     - [[meditation practice]]
       - [ ] post in https://twitter.com/flancian/status/1460668561974771718
-    - [[building bridges]]
-
->>>>>>> 4f37fb6ecac546a3e031e26e1d9e87c4c16ae8e0
+    - [[building bridges]]
\ No newline at end of file