diff --git a/journal/2021-08-01.md b/journal/2021-08-01.md
index 7e53a6f69..7291eccb6 100644
--- a/journal/2021-08-01.md
+++ b/journal/2021-08-01.md
@@ -1,8 +1,5 @@
 # 2021-08-01
 
-<<<<<<< HEAD
 - [[patterning]] very early edition :)
-=======
 - I wonder if I can make [[foam]] not start each file with a header, I need to find the doc showing all settings.
 - [[trying to disable slugs]]
->>>>>>> b6033eb08826969d871dd50b5a823b8a6e66dfc6