From 0cf640d79f109de25d020b7c35e9b7c677d64452 Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Thu, 21 Mar 2024 12:39:04 +0100
Subject: [PATCH] Update CHANGELOG.md

(cherry picked from commit e0f963d7855df182bd90f5f02af486ec30650d7c)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17e27112ff..f09eed7d77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,18 @@ 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