diff --git a/journal/2022-01-07.md b/journal/2022-01-07.md
index d9ef1b7f1..188b4d79e 100644
--- a/journal/2022-01-07.md
+++ b/journal/2022-01-07.md
@@ -7,17 +7,11 @@
   - [[red rocket]]
   - [[licorice pizza]]
   - [[the last picture show]]
-<<<<<<< HEAD
 - [[angle]] == [[angular angel]]
   - [[agora project]]
-=======
 - [[flancia weekly]]
 - [[push]] [[2022-01-08]]
   - [ ] add video stoa to the Agora
      - <iframe allow="camera; microphone; fullscreen; display-capture; autoplay" src="https://meet.jit.si/SuccessiveUniversesTestifyYet" style="height: 100%; width: 100%; border: 0px;"></iframe>
-<<<<<<< HEAD
 - [[push]] [[2021-01-12]]
   - a friend's 40th birthday!
-=======
->>>>>>> 682d2fd1b8fdd900968bb40edc223411482f6519
->>>>>>> 074e7fbc34e5af02117738619b69da1369ba3390