diff --git a/2025-03-12.md b/2025-03-12.md
index 70605d72c..19837907d 100644
--- a/2025-03-12.md
+++ b/2025-03-12.md
@@ -1,7 +1,5 @@
-<<<<<<< HEAD
-- [ ] Move the Incubator meeting to US-friendly 
-- [ ] Check PM AI chatroom
-- [ ] go/detectr -- hold it until US takes it, or Gavin?
-=======
+- [x] Move the Incubator meeting to US-friendly 
+- [x] Check PM AI chatroom
+- [x] go/detectr -- hold it until US takes it, or Gavin?
+  - done (later), then Hao plus maybe Abi?
 - My new wireless router arrived and it's already a great improvement in digital quality of life at home :) I hope it continues to work without fuss!
->>>>>>> 4b42c4fd38c42fe51cce27116ace2d45b1b86341
diff --git a/2025-03-20.md b/2025-03-20.md
index 2e42e19fa..586813831 100644
--- a/2025-03-20.md
+++ b/2025-03-20.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 - I met [[smurp]] today!
   - It was great!
   - I got a [[cal]] after seeing it at his smurp.com/cal and previously.
-  -
-=======
 - [[zine]] -> [[us]]
->>>>>>> 4b42c4fd38c42fe51cce27116ace2d45b1b86341
diff --git a/2025-03-22.md b/2025-03-22.md
index 33b304305..598c59f5c 100644
--- a/2025-03-22.md
+++ b/2025-03-22.md
@@ -1,11 +1,8 @@
-<<<<<<< HEAD
 - [[nostromo]] died today!
   - after almost dying many times.
   - I thank them for their service! beautiful computer.
   - [[paramita]] was ready to take its spot.
 - [[bouncepaw]] told me about [[xremap]] today! it looks great, like it could fix several issues I had in the back of my mind with the input layer in wayland.
-=======
 - New day but I'm working on my todo on [[2025-03-21]] :)
 - I implemented [[chill]] today (late yesterday) to set the light levels at home to a nice late night/hacking level using [[home assistant]], that was somewhere on my todo list :)
 - I read about [[router7]] by [[stapelberg]].
->>>>>>> 4b42c4fd38c42fe51cce27116ace2d45b1b86341