diff --git a/20260118.md b/20260118.md
index 27753e8..afa9ef3 100644
--- a/20260118.md
+++ b/20260118.md
@@ -1,9 +1,5 @@
 # Daily 2026-01-18
 
-## 20:55:38
-
-ls
-
 ## 21:41:10
 
 dinner lamb sweet and sour peppers
diff --git a/20260119.md b/20260119.md
index 78f402b..e3fab37 100644
--- a/20260119.md
+++ b/20260119.md
@@ -1,5 +1,6 @@
 # Daily 2026-01-19
 
+<<<<<<< HEAD
 ## 05:32:55
 
 m1
@@ -53,3 +54,8 @@ watered lawn
 ## 17:55:14
 
 n1
+=======
+## 19:22:47
+
+fed dogs
+>>>>>>> ceab0289d0194cddda8914539090ad7079eaf4a8