fix: drop changelog changes (merge conflict resolution error)

Author: LesnyRumcajs

CHANGELOG.md

@@ -29,49 +29,6 @@
 
 ### Added
 
-### Changed
-
-### Removed
-
-### Fixed
-
-- [#6327](https://github.com/ChainSafe/forest/pull/6327) Fixed: Forest returns 404 for all invalid api paths.
-
-- [#6140](https://github.com/ChainSafe/forest/pull/6140) Fixed the `eth_getLogs` RPC method to accept `None` as the `address` parameter.
-
-## Forest v0.30.5 "Dulce de Leche"
-
-Non-mandatory release supporting new API methods and addressing a critical panic issue.
-
-### Added
-
-- [#6231](https://github.com/ChainSafe/forest/pull/6231) Implemented `Filecoin.ChainGetTipSet` for API v2.
-
-- [#6312](https://github.com/ChainSafe/forest/pull/6312) Implemented `Filecoin.StateGetActor` for API v2.
-
-- [#6312](https://github.com/ChainSafe/forest/pull/6312) Implemented `Filecoin.StateGetID` for API v2.
-
-- [#6323](https://github.com/ChainSafe/forest/pull/6323) Implemented `Filecoin.FilecoinAddressToEthAddress` for API v1 and v2.
-
-### Fixed
-
-- [#6325](https://github.com/ChainSafe/forest/pull/6325) Fixed a panic that could occur under certain message pool conditions and the `Filecoin.MpoolSelect` RPC method.
-
-## Forest v0.30.4 "DeLorean"
-
-This is a non-mandatory release that fixes a chain sync issue that is caused by time traveling block(s).
-
-### Fixed
-
-- [#6241](https://github.com/ChainSafe/forest/pull/6241) Fixed a sync issue that is caused by time traveling block(s).
-
-## Forest v0.30.3 "Trishul"
-
-This is a non-mandatory release that brings important enhancements in Forest's tooling capabilities.
-The release includes new CLI commands for snapshot monitoring, a crucial fork handling bug fix and ETH API performance improvements, and error handling.
-
-### Added
-
 - [#6082](https://github.com/ChainSafe/forest/issues/6082) Added `forest-cli snapshot export-status` and `forest-cli snapshot export-cancel` subcommands to monitor or cancel an export, respectively.
 
 - [#6161](https://github.com/ChainSafe/forest/pull/6161) Added `forest-tool db import` subcommand.
@@ -88,6 +45,8 @@ The release includes new CLI commands for snapshot monitoring, a crucial fork ha
 
 - [#6145](https://github.com/ChainSafe/forest/pull/6145) Updated `forest-cli snapshot export` to use v2 format by default.
 
+### Removed
+
 ### Fixed
 
 - [#6178](https://github.com/ChainSafe/forest/pull/6178) Fixed incorrect error code for unsupported RPC methods.
@@ -98,8 +57,6 @@ The release includes new CLI commands for snapshot monitoring, a crucial fork ha
 
 - [#6234](https://github.com/ChainSafe/forest/pull/6234) Support `input` as an alias for `data` in `eth_call` and `eth_estimateGas` RPC methods.
 
-- [#6235](https://github.com/ChainSafe/forest/pull/6235) Fixed a potential deadlock in chain follower when handling fork(s).
-
 ## Forest v0.30.2 "Garuda"
 
 This is a non-mandatory release that brings important enhancements to Forest's tooling capabilities, Ethereum RPC compatibility, and F3 integration.
@@ -121,6 +78,7 @@ The release includes new CLI commands for snapshot management and state inspecti
 
 - [#6103](https://github.com/ChainSafe/forest/pull/6103) Fixed `eth_getTransactionCount` to return the nonce of the requested tipset and not its parent.
 
+- [#6140](https://github.com/ChainSafe/forest/pull/6140) Fixed the `eth_getLogs` RPC method to accept `None` as the `address` parameter.
 
 ## Forest v0.30.1 "Laurelin"