diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a0bd3..b029d3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - use `Double` rather than `FLoat` for internal calculations
     - `cursorPos`, `dt` natively `Double` already
 
+<<<<<<< HEAD
 ## [0.2.0] - 2025-12-07
+=======
+## [0.2.0-pre0] - 2025-12-07
+>>>>>>> development
 
 ### Added