Solve merge conflict

Author: spacesailor24

CHANGELOG.md

@@ -405,15 +405,16 @@ Released with 1.0.0-beta.37 code base.
 ### Added
 
 - London transaction support (#4155)
-- RPC support `eth_feehistory` call
+- RPC support `eth_feehistory` call (#4191)
+- Add `toNumber` method to `web3.utils` (#4191)
 
 ### Changed
  - Grammar fix (#4088) and updated Swarm (#4151)and Whisper doc links (#4170)
  - Removed deprecation notice for HttpProvider (#4008)
  - Nonce added to send options in documentation and types (#4052)
  - Updated Solidity example to modern syntax (#4147)
  - Changing web3 connection example from lets to const (#3967)
- - Updated the documentation for the transaction object to include EIP-2718 and EIP-1559 options
+ - Updated the documentation for the transaction object to include EIP-2718 and EIP-1559 options (#4188)
 
 ## [Unreleased]