diff --git a/2025-03-23.md b/2025-03-23.md
index 29b97bdc9..79e9f6b19 100644
--- a/2025-03-23.md
+++ b/2025-03-23.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 - Traveling to the US today!
   - As I write this I'm typing on my laptop on an American flight from [[Heathrow]] to [[Durham]].
   - I've been reading and listening to audiobooks:
@@ -21,3 +22,8 @@
 - I enjoyed reading [[The discrete charm of the Turing machine]] by [[Greg Egan]]. This was in [[Instantiation]]; previously (in February) I read [[The Best of Greg Egan]], a selection of his short stories, and enjoyed them a lot!
   - He's definitely one of my favorite living writers.
 - Now I'm giving [[Binding Chaos]] a taste, after finding it on my [[Kobo]] and also mentioned in my long term todo mentioned above.
+=======
+- Travel day!
+  - As I write this I'm on the second plane today, about to tale off from Heathrow towards Raleigh.
+- Ladu Burup's day as I leave -- I will miss her! She's in good hands though.
+>>>>>>> 9e0dd095d5470916fcdbdd25f4b9a1737660c899