chore: fix changelog

CHANGELOG.md

@@ -24,12 +24,9 @@
 - Implemented `to_hex` for `AccountIdPrefix` and `epoch_block_num` for `BlockHeader` (#1039).
 - Introduce `AccountIdBuilder` to simplify `AccountId` generation in tests (#1045).
 - Introduced `AccountComponentTemplate` with TOML serialization and templating (#1015, #1027).
-<<<<<<< HEAD
 - [BREAKING] Updated the names and values of the kernel procedure offsets and corresponding kernel procedures (#1037).
-=======
 - Introduce `AccountIdError` and make account ID byte representations (`u128`, `[u8; 15]`) consistent (#1055).
 - Refactor `AccountId` and `AccountIdPrefix` into version wrappers (#1058).
->>>>>>> next
 
 ## 0.6.2 (2024-11-20)