diff --git a/journal/2021-10-08.md b/journal/2021-10-08.md
index cad59496d..048d1ff30 100644
--- a/journal/2021-10-08.md
+++ b/journal/2021-10-08.md
@@ -1,11 +1,7 @@
 # 2021-10-08
-<<<<<<< HEAD
-=======
-
 - [[pay it forward]]
 - [[in bloom]]
 - [[confessions]]
 - [[hellthread]]
 - [[snapshot]]
 - [[free software]]
->>>>>>> 12675e316d89c55811f833e25c070afcb763b171
diff --git a/sundays for hacking.md b/sundays for hacking.md
index b77e961a5..ebf01a7ea 100644
--- a/sundays for hacking.md	
+++ b/sundays for hacking.md	
@@ -1,3 +1,5 @@
 # sundays for hacking
 
+In Flancia, Sundays are for hacking.
+