diff --git a/commit-template.txt b/commit-template.txt
new file mode 100644
index 000000000..bb96a44fc
--- /dev/null
+++ b/commit-template.txt
@@ -0,0 +1,2 @@
+Merge, merge, merge!
+As we [[fork]] we'll [[merge]]!
diff --git a/journal/2023-05-17.md b/journal/2023-05-17.md
new file mode 100644
index 000000000..51e039bfb
--- /dev/null
+++ b/journal/2023-05-17.md
@@ -0,0 +1,4 @@
+- [[work]]
+- #push [[yoga]]
+  - [[common yoga protocol]]
+    - recommended by [[Rohit]]
diff --git a/journal/2023-09-04.md b/journal/2023-09-04.md
index 88fa3b1b0..a0e9f743f 100644
--- a/journal/2023-09-04.md
+++ b/journal/2023-09-04.md
@@ -1,5 +1,6 @@
 - [[AG]] :)
 - [[work]]
+  - trying to enjoy [[focus week]]!
 - [[Olof]] recommended https://www.youtube.com/watch?v=DurPqcBkI4g for when I learn [[Swedish]] :)
 - #push [[poems]]
   - [[deep]]
diff --git a/journal/2023-12-11.md b/journal/2023-12-11.md
index 92924f881..cc9143d33 100644
--- a/journal/2023-12-11.md
+++ b/journal/2023-12-11.md
@@ -12,3 +12,4 @@
   - [[december adventure]]
     - thinking about this December as an introduction to [[2024]]!
 - [[Milei]] asumió
+- [[Schwarzwald]] over the weekend with [[AG]] :)
diff --git a/journal/2023-12-11_BACKUP_277894.md b/journal/2023-12-11_BACKUP_277894.md
new file mode 100644
index 000000000..cc9143d33
--- /dev/null
+++ b/journal/2023-12-11_BACKUP_277894.md
@@ -0,0 +1,15 @@
+- [[Flancia]]:
+  - [[December Adventure]]
+  - [[work]]
+  - [[Selva Negra]]
+- [[poems]]:
+  - fork, fork, fork!
+    - as we merge we'll [[fork]]!
+  - agua, agua, [[agua]]:
+    - agua para los sedientos!
+  - [[yoga with x]]:
+    - was great and chaotic :)
+  - [[december adventure]]
+    - thinking about this December as an introduction to [[2024]]!
+- [[Milei]] asumió
+- [[Schwarzwald]] over the weekend with [[AG]] :)
diff --git a/journal/2023-12-11_BASE_277894.md b/journal/2023-12-11_BASE_277894.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/journal/2023-12-11_LOCAL_277894.md b/journal/2023-12-11_LOCAL_277894.md
new file mode 100644
index 000000000..92924f881
--- /dev/null
+++ b/journal/2023-12-11_LOCAL_277894.md
@@ -0,0 +1,14 @@
+- [[Flancia]]:
+  - [[December Adventure]]
+  - [[work]]
+  - [[Selva Negra]]
+- [[poems]]:
+  - fork, fork, fork!
+    - as we merge we'll [[fork]]!
+  - agua, agua, [[agua]]:
+    - agua para los sedientos!
+  - [[yoga with x]]:
+    - was great and chaotic :)
+  - [[december adventure]]
+    - thinking about this December as an introduction to [[2024]]!
+- [[Milei]] asumió
diff --git a/journal/2023-12-11_REMOTE_277894.md b/journal/2023-12-11_REMOTE_277894.md
new file mode 100644
index 000000000..df9a66c24
--- /dev/null
+++ b/journal/2023-12-11_REMOTE_277894.md
@@ -0,0 +1 @@
+- [[Schwarzwald]] over the weekend with [[AG]] :)
diff --git a/journal/2023-12-12.md b/journal/2023-12-12.md
index 3f5197df0..507bc9f20 100644
--- a/journal/2023-12-12.md
+++ b/journal/2023-12-12.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 - [[Bettwanzen]] inspection finally came and results were relatively positive:
   - These are [[bed bugs]] indeed.
   - And, as I was hoping, they are only in the main bedroom -- haven't spread to the guest room where I've been sleeping or anywhere else it seems \o/
@@ -15,3 +16,7 @@
   - and the descendants of [[Pinafore]], like [[Enafore]]
   - and [[Phanpy]]
 - [[7]]
+=======
+- [[december adventure]]:
+  - [[new style pulls]] for social media.
+>>>>>>> 8a15d6d9054b02ecce3a9d195ad6fbff584db0f2