diff --git a/changelog.md b/changelog.md
index 3587b199..211320db 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 ## 0.0.409 - 2026-02-12
 
 - /diff uses full screen in alt-screen mode
@@ -73,6 +75,7 @@
 - `/mcp show` displays enabled/disabled status for MCP tools
 - MCP tool responses now include structured content (images, resources) for richer UI display in VS Code
 
+>>>>>>> 0e73701c398d12e31855d4f3652a372122fefd34
 ## 0.0.405 - 2026-02-05
 
 - Plugin and marketplace names support uppercase letters