From 83a6413a9fc7d9ce1bf9991ecc72e7709908339b Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:16:59 +0000
Subject: [PATCH] [autofix.ci] apply automated fixes

---
 CHANGELOG.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93a3e06e..58c2f38e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,8 @@ and this project adheres to
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-=======
+# <<<<<<< HEAD
+
 ## Added
 
 - cosmwasm-std: Implement `From<Uint64> for u{64,128}`,
@@ -27,7 +27,9 @@ and this project adheres to
 [#2310]: https://github.com/CosmWasm/cosmwasm/pull/2310
 [#2340]: https://github.com/CosmWasm/cosmwasm/pull/2340
 
->>>>>>> 3b8071bf (Implement From<Uint{64,128}> for u{64,128} and From<Int{64,128}> for i{64,128})
+> > > > > > > 3b8071bf (Implement From<Uint{64,128}> for u{64,128} and
+> > > > > > > From<Int{64,128}> for i{64,128})
+
 ## [2.2.0] - 2024-12-17
 
 ### Added