diff --git a/journal/2021-03-21.md b/journal/2021-03-21.md
index 5cc4b8b80..800c20c6c 100644
--- a/journal/2021-03-21.md
+++ b/journal/2021-03-21.md
@@ -1,14 +1,14 @@
 # 2021-03-21
 
-<<<<<<< HEAD
 - [[do]]
 - [[moa]]
+- [[push]] [[yoga]]
+  - [[burn]]
 
 [//begin]: # "Autogenerated link references for markdown compatibility"
 [do]: ../do "Do"
 [moa]: ../moa "Moa"
-[//end]: # "Autogenerated link references"
-=======
-- [[push]] [[yoga]]
-  - [[burn]]
->>>>>>> 78d77d93be0d40cfe3a5b262ee6aff2406e4ab86
+[push]: ../push "Push"
+[yoga]: ../yoga "Yoga"
+[burn]: ../burn "burn"
+[//end]: # "Autogenerated link references"
\ No newline at end of file