diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64fff980631..f2f431d31d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 Docs: https://docs.openclaw.ai
 
-<<<<<<< HEAD
 ## 2026.2.15 (Unreleased)
 
 ### Changes
@@ -44,6 +43,7 @@ Docs: https://docs.openclaw.ai
 - Cron: infer `payload.kind="agentTurn"` for model-only `cron.update` payload patches, so partial agent-turn updates do not fail validation when `kind` is omitted. (#15664) Thanks @rodrigouroz.
 - Subagents: use child-run-based deterministic announce idempotency keys across direct and queued delivery paths (with legacy queued-item fallback) to prevent duplicate announce retries without collapsing distinct same-millisecond announces. (#17150) Thanks @widingmarcus-cyber.
 - Discord: ensure role allowlist matching uses raw role IDs for message routing authorization. Thanks @xinhuagu.
+
 ## 2026.2.14
 
 ### Changes