From ba62ea36e9ec4b8aa8a2800f639827bed7331062 Mon Sep 17 00:00:00 2001
From: Rohan Agarwal <rohan.agarwal.1@coinbase.com>
Date: Wed, 18 Sep 2024 18:32:56 -0400
Subject: [PATCH] Address merge conflict

---
 CHANGELOG.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91f66562..df18c889 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,6 @@
 
 ## Unreleased
 
-## [0.5.1] - 2024-09-12
-
-### Fixed
-- Fixed a bug that blocked arbitrum mainnet wallets from being created
 ## [0.6.0] - 2024-09-18
 
 ### Added
@@ -15,7 +11,12 @@
 
 ### Breaking
 - `Asset#toAtomicAmount` now returns a BigInt instead of a Decimal
-  
+
+## [0.5.1] - 2024-09-12
+
+### Fixed
+- Fixed a bug that blocked arbitrum mainnet wallets from being created
+
 ## [0.5.0] - 2024-09-11
 
 - Add Arbitrum-Mainnet support for Native transfers.