From 67044f8e8f92b3eaabc72c1eab7324eeb713816d Mon Sep 17 00:00:00 2001
From: KonradStaniec <konrad.staniec@gmail.com>
Date: Mon, 14 Oct 2024 14:06:36 +0200
Subject: [PATCH] fix merge conflicts changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f3c7c6..a52519b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## Unreleased
 
+### Misc Improvements
+
+* [51](https://github.com/babylonlabs-io/btc-staker/pull/51) Use int64
+  for satoshi amount related values.
+  
 ## v0.7.1
 
 ### Bug fix
@@ -42,11 +47,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [#53](https://github.com/babylonlabs-io/btc-staker/pull/53) Use only quorum of
 signatures when building unbonding transaction witness
 
-### Misc Improvements 
-
-* [51](https://github.com/babylonlabs-io/btc-staker/pull/51) Use int64
-  for satoshi amount related values.
-
 ## v0.7.0
 
 ### Api breaking