diff --git a/flow.md b/flow.md
index faba06448..ac3b24dfc 100644
--- a/flow.md
+++ b/flow.md
@@ -4,7 +4,7 @@
   - [[mental state]] [[desirable]]
   - #wp https://en.wikipedia.org/wiki/Flow_(psychology)
     - As defined by [[Mihaly Csikszentmihalyi]] (I can never remember how to spell his name).
-    - "In positive psychology, a flow state, also known colloquially as being in the zone, is the mental state in which a person performing some activity is fully immersed in a feeling of energized focus, full involvement, and enjoyment in the process of the activity. In essence, flow is characterized by the complete absorption in what one does, and a resulting transformation in one's sense of time." 
+    - "In positive psychology, a flow state, also known colloquially as being in the zone, is the mental state in which a person performing some activity is fully immersed in a feeling of energized focus, full involvement, and enjoyment in the process of the activity. In essence, flow is characterized by the complete absorption in what one does, and a resulting transformation in one's sense of time."
 - a [[project]]
   - by [[david-gelernter]] and [[eric freeman]]
   - https://www.wsj.com/articles/the-future-of-the-internet-is-flow-1443796858
@@ -13,3 +13,11 @@
 I don't enter flow as often as I would like and that usually frustrates me; it's low key frustration but frustation nevertheless, and it builds up the longer it is sustained. It's like a part of my brain knows that we should get back to it, but life gets in the way; or, most often, I just procrastinate on triggering the right conditions.
 
 Sometimes I like to get into flow with a [[quick fix]].
+
+--
+
+- a [[calendar]].
+  - [[30 days]] of [[yoga with Adriene]] and [[yoga with x]]
+  - #1 https://www.youtube.com/watch?v=Qbnpbqd-jhQ
+  - #2 https://www.youtube.com/watch?v=4rZAQ2LfDAs
+
diff --git a/journal/2024-01-03.md b/journal/2024-01-03.md
index 4dc11a584..1c4a681c9 100644
--- a/journal/2024-01-03.md
+++ b/journal/2024-01-03.md
@@ -1,3 +1,14 @@
+<<<<<<< HEAD
 - All my computers tend to be melting down all the time. They run out of RAM and CPU. It all feels quite un-ecological, but I guess we're all betting on becoming a higher level [[kardashev]]?
   - I'd like to keep [[Flancia sustainable]] though.
     - This led me to [[future studies]].
+=======
+- [[work]]
+- [[fotl]]
+- [[agora development]]
+  - [ ] make it so that [[opensearch]] document is utf-8 so chrome stops ignoring Agora Search (presumably) :)
+    - I think the actual issue is that new Chrome only loads [[opensearch]] data when the user performs a search *in the root of the webpage*, e.g. https://anagora.org -- and currently the Agora just redirects to /index so this never happens. Hmm.
+      - [ ] Maybe I should just remove that redirect.
+- [[fediverse]]
+- [[yoga with x]]
+>>>>>>> c07f5281ee0b4bc07cd7574d8ac32e52bd045d14
diff --git a/today.md b/today.md
index b96c24923..49b24dbb9 100644
--- a/today.md
+++ b/today.md
@@ -4,3 +4,4 @@
   - written in a [[moment]] in time, describing a [[duration]] :)
   - [[go]] https://anagora.org/today
   - I keep journal entries, that is, notes with filename `YYYY-MM-DD.md`, in the `journal/` directory.
+- IIRC as of the time of writing the [[Agora]] doesn't display this note because /today is overriden to redirect to e.g. [[2024-01-03]] :)
diff --git a/yoga with x.md b/yoga with x.md
index e2a063bbf..420db695d 100644
--- a/yoga with x.md	
+++ b/yoga with x.md	
@@ -6,6 +6,7 @@
     - I'm a fan of [[Yoga with Adriene]].
     - #pull [[move]] (2022)
     - #pull [[center]] (2023)
+    - #pull [[flow]] (2024)
     - I usually announce it on [[twitter]]/[[mastodon]]
 		- I've been recording some sessions as an example/demo.
       - [[playlist]] https://www.youtube.com/playlist?list=PLofT8_Cv-W-NMgYeb7mtN3M_kBgkYgUjq