diff --git a/journal/2021-12-04.md b/journal/2021-12-04.md
index 30d623bb2..393f5f5a1 100644
--- a/journal/2021-12-04.md
+++ b/journal/2021-12-04.md
@@ -1,6 +1,5 @@
 # 2021-12-04
 
-<<<<<<< HEAD
 - [[reddy2go]]
   - [[knovigator]]
     - [[metamitya]]