Update CHANGELOG.md

Author: k-yang

CHANGELOG.md

@@ -42,14 +42,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#2271](https://github.com/NibiruChain/nibiru/pull/2271) - fix(ci): update tag-pattern for changelog step in releases
 - [#2270](https://github.com/NibiruChain/nibiru/pull/2270) - refactor(app): remove private keeper struct and transient/mem keys from app
-<<<<<<< HEAD
 - [#2274](https://github.com/NibiruChain/nibiru/pull/2274) - feat(evm)!: update to geth v1.13 with EIP-1153, PRECOMPILE_ADDRS, and transient storage support
 - [#2275](https://github.com/NibiruChain/nibiru/pull/2275) - feat(evm)!: update
-to geth v1.14 with tracing updates and new StateDB methods. 
-   - This upgrade keeps Nibiru's EVM on the Berlin upgrade to avoid
+to geth v1.14 with tracing updates and new StateDB methods.
+  - This upgrade keeps Nibiru's EVM on the Berlin upgrade to avoid
    incompatibilities stemming from functionality specific to Ethereum's consesnus
    setup. Namely, blobs (Cancun) and Verkle additions for zkEVM.
-   - The jump to v1.14 was necessary to use an up-to-date "cockroach/pebble" DB
+  - The jump to v1.14 was necessary to use an up-to-date "cockroach/pebble" DB
    dependency and leverage new generics features added in Go 1.23+.
 - [#2288](https://github.com/NibiruChain/nibiru/pull/2288) - chore(ci): add workflow to check for missing upgrade handler
 - [#2278](https://github.com/NibiruChain/nibiru/pull/2278) - chore: migrate to cosmossdk.io/mathLegacyDec and cosmossdk.io/math.Int