diff --git a/journal/2021-12-29.md b/journal/2021-12-29.md
index 43b0e4d3a..1d89557b4 100644
--- a/journal/2021-12-29.md
+++ b/journal/2021-12-29.md
@@ -2,18 +2,16 @@
 
 - [[gustavo todo]]
 - [[test]]
-  - <a href="https://twitter.com/flancian/status/1476126755807191047">test of new twitter embed code when the source has a proper a href</a>
-  - https://twitter.com/flancian/status/1476126755807191047
-- [ ] work
-- [ ] do
-<<<<<<< HEAD
-- [[commons]]
-  - [[knowledge commons]]
-    - [[agora]]
-      - [[node club]]
-        - [[commons]]
-- [[later]]
-  - [[silly]]
-    - [[the ministry of silly walks]]
-=======
->>>>>>> 99f978cbca1895e8bc83d3f4171b706c0e3038f2
+  - <a href="https://twitter.com/flancian/status/1476126755807191047">test of new twitter embed code which skips hrefs</a>
+  - https://twitter.com/flancian/status/1476126755807191047: test of embeds presumably working :)
+- [x] [[labour]]
+- [ ] [[work]]
+  - [[write]]
+    - [[commons]] 
+      - [[knowledge commons]]
+        - [[agora]]
+          - [[node club]]
+            - [[commons]]
+  - [[later]]
+    - [[silly]]
+      - [[the ministry of silly walks]]
\ No newline at end of file