Fix changelog

CosmWasm · Mar 21, 2024 · 65cd96f · 65cd96f
1 parent 0cf640d
commit 65cd96f
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Fixed
+
+- cosmwasm-std: Correctly deallocate vectors that were turned into a `Region`
+  via `release_buffer` ([#2062])
+
+[#2062]: https://github.com/CosmWasm/cosmwasm/pull/2062
+
 ## [1.5.3]
 
 ### Changed
@@ -15,18 +22,7 @@ and this project adheres to
 
 [#2005]: https://github.com/CosmWasm/cosmwasm/pull/2005
 
-<<<<<<< HEAD
 ## [1.5.2] - 2024-01-15
-=======
-### Fixed
-
-- cosmwasm-std: Correctly deallocate vectors that were turned into a `Region`
-  via `release_buffer` ([#2062])
-
-[#2062]: https://github.com/CosmWasm/cosmwasm/pull/2062
-
-## [2.0.0] - 2024-03-12
->>>>>>> e0f963d78 (Update CHANGELOG.md)
 
 ### Fixed