diff --git a/journal/.2022_03_03.md.swp b/journal/.2022_03_03.md.swp
deleted file mode 100644
index 8b239e173..000000000
Binary files a/journal/.2022_03_03.md.swp and /dev/null differ
diff --git a/journal/2022_03_03.md b/journal/2022_03_03.md
index 98ad2b25d..1b797b55f 100644
--- a/journal/2022_03_03.md
+++ b/journal/2022_03_03.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 - [[elinor ostrom]]
 	- [[switzerland]]
 		- [[vaud]]
@@ -12,7 +11,6 @@
 		- [[marilyn strathern]] https://www.taylorfrancis.com/chapters/edit/10.4324/9781315673172-10/inroads-altruism-1-marilyn-strathern
 			- "This chapter considers the idea of organs and altruism being commons-like resources, insofar as they are at once available to anyone and treated as always in short supply."
 - LATER [[thesis]]
-=======
 - Yesterday I had the day off but ended up being sick :(
 	- Had a light fever, not too much though, about 37.5.
 	- After a good night's sleep I'm almost back to normal though (!), although tired. Perhaps this is what Covid feels like when you're fully vaccinated? Or perhaps I'm just relatively stressed and fighting back a regular cold.
@@ -25,4 +23,3 @@
 		- graph improvements could be fun and are always visible though, hmm. I tried pitching this as a community contribution but it didn't take for now; and I think I could give [[agora wide graphs]] a shot, or add [[nth order local graphs]] and see how they look.
 		- [[ui improvements]] in general are needed: e.g. we discussed multi-column layout (some sidebar for navigation to begin with?) a few times but I never really gave it a shot.
 		- if you are reading this and you have an opinion on what we should improve first, please let me know :)
->>>>>>> 0af76739549f916831ee0e641e14a7d97cca2399