diff --git a/journal/2021-11-13.md b/journal/2021-11-13.md
index 033237561..ddfa0edf7 100644
--- a/journal/2021-11-13.md
+++ b/journal/2021-11-13.md
@@ -1,8 +1,5 @@
 # 2021-11-13
 
-<<<<<<< HEAD
 - [[jazz at the pawnshop]]
-=======
 - [[bernardo]] and [[martin]] came over, are visiting until Wednesday.
 - [[james joyce]]
->>>>>>> cbf13245d857430c270904330990578fc3f02bbb