diff --git a/20260102.md b/20260102.md
index 2cc53f1..ba7b9c2 100644
--- a/20260102.md
+++ b/20260102.md
@@ -65,6 +65,7 @@ Sleep
 
 peanuts
 
+<<<<<<< HEAD
 ## 20:00:34
 
 n1
@@ -76,3 +77,8 @@ drink vermouth and soda
 ## 20:43:19
 
 chocolate ashrc bin daily.nb-plugin index.html weather.sh wtr.sh 2
+=======
+## 18:09:20
+
+athletic greens
+>>>>>>> 9b84551 ([nb] Edit: 20260102.md)