diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7ea7b..95c9a65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+<<<<<<< HEAD
 ## Unreleased
 
 - update to gleam v0.20
@@ -14,6 +15,13 @@
   - `flag.constraint` to attach a constraint to a flag
 - rename `glint.with_global_flags` to `glint.global_flags`
 - `glint` gains the `global_flag` and `flag_tuple` functions.
+=======
+## [Unreleased](https://github.com/TanklesXL/glint/compare/v0.11.3...HEAD)
+
+## [0.11.3](https://github.com/TanklesXL/glint/compare/v0.11.2...v0.11.3)
+
+- fixes string concat precedence bug
+>>>>>>> b8ac52ecb9696390ae0a67bc51f798673c3a7f85
 
 ## [0.11.2](https://github.com/TanklesXL/glint/compare/v0.11.1...v0.11.2)