diff --git a/20251231.md b/20251231.md
index 6848fc0..f0c3389 100644
--- a/20251231.md
+++ b/20251231.md
@@ -1,6 +1,5 @@
 # Daily 2025-12-31
 
-<<<<<<< HEAD
 ## 05:12:18
 
 n1
@@ -20,6 +19,5 @@ possum in wall by kitchen
 n1
 
 ## 06:31:59
->>>>>>> 6de941a3960ea9319909382e2641043ff26dec33
 
 coffee with Dawn