diff --git a/journal/.2022-01-29.md.swp b/journal/.2022-01-29.md.swp
deleted file mode 100644
index 6c63d5859..000000000
Binary files a/journal/.2022-01-29.md.swp and /dev/null differ
diff --git a/journal/2022-01-29.md b/journal/2022-01-29.md
index 180bab433..4b2a1785f 100644
--- a/journal/2022-01-29.md
+++ b/journal/2022-01-29.md
@@ -7,10 +7,7 @@
 		- #push [[anchors]]
 			- I'd been thining about anchors due to [[obsidian block anchors]] and the topic came up again today; [[bouncepaw]] is thinking about many of the same things. We decided to try to work on [[anchors]] together; try to agree on shared conventions.
 			- [[anchors]] for me generalize to the problem of transmitting [[context]], [[scope]]. I've been exploring these problems with [[push]] and [[pull]].
-<<<<<<< HEAD
-=======
 	- caught up with [[metasj]] in the evening too, about the [[commons]] and [[shared pools]].
->>>>>>> c428209fb798d57b0a5999d9c4507065a2e45d86
 - [[agora discuss]]
 	- #push [[hubs]]
 		- [[mozilla hubs]]
@@ -24,10 +21,7 @@
 	- [x] [[cleanup]]
 	- [x] [[chat]]
 	- [x] [[chat]]
-<<<<<<< HEAD
-	- [ ] [[matrix bot]]
 	- [ ] [[yoga]]
-=======
 	- [x] [[matrix bot]]
 		- took a break, see above :)
 		- with ten minutes left, let's see...
@@ -45,4 +39,3 @@
 					- based it on https://github.com/TomCasavant/RedditMaubot which is a bit of a joke bot, but as an example it was good enough ;) and MIT licensed
 					- in its own git repo for now, might just move all code to [[agora bridge]] so it coexists with social media bots though?
 - we bought a lot of chocolate today to bring as gift to family and friends :)
->>>>>>> c428209fb798d57b0a5999d9c4507065a2e45d86