fix conflict

Author: thomas-nguy

CHANGELOG.md

@@ -44,17 +44,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (evm) [#742](https://github.com/crypto-org-chain/ethermint/pull/742) fix: prevent nil pointer dereference in tracer hooks
 * (evm) [#728](https://github.com/crypto-org-chain/ethermint/pull/728) feat: support preinstalls
 * (evm) [#722](https://github.com/crypto-org-chain/ethermint/pull/722) feat: support EIP-2935
-<<<<<<< HEAD
 * (rpc) [#764](https://github.com/crypto-org-chain/ethermint/pull/764) rpc: apply state overrides to eth_estimateGas
 * (ante) [#775](https://github.com/crypto-org-chain/ethermint/pull/775) fix: race condition in antecache
 * (ante) [#789](https://github.com/crypto-org-chain/ethermint/pull/789) fix: add check on evm transaction tip
-<<<<<<< HEAD
 * (api) [#768](https://github.com/crypto-org-chain/ethermint/pull/768) feat: support create access list
-=======
-=======
-* (api) [#768](https://github.com/crypto-org-chain/ethermint/pull/768) feat: support create access list
->>>>>>> dd48cad8 (add changelog)
->>>>>>> 68166ac2 (add changelog)
 
 ## [v0.22.0] - 2025-08-12