diff --git a/20251229.md b/20251229.md
index 38ea101..5001976 100644
--- a/20251229.md
+++ b/20251229.md
@@ -90,6 +90,7 @@ dinner ham with coleslaw
 
 drink campari and soda
 
+<<<<<<< HEAD
 ## 21:05:27
 
 snack cherries
@@ -97,3 +98,8 @@ snack cherries
 ## 21:05:48
 
 drink campari and soda
+=======
+## 19:33:48
+
+n1
+>>>>>>> c57f2aa ([nb] Edit: 20251229.md)