fix: resolve merge conflicts in and cache mod

crates/rpc/rpc-eth-types/src/cache/mod.rs

@@ -575,8 +575,9 @@ impl<B: Block, R: Clone> ChainChange<B, R> {
 /// immediately before they need to be fetched from disk.
 ///
 /// Updates [`EthStateCache`] in two scenario :
-/// 1. On reorgs: sets [`latest_chain_change`] to None and removes reorged blocks
-/// 2. On new canonical blocks: updates [`latest_chain_change`] and caches the new blocks
+/// 1. On reorgs: sets `EthStateCache::latest_chain_change` to None and removes reorged blocks
+/// 2. On new canonical blocks: updates `EthStateCache::latest_chain_change` and caches the new
+///    blocks
 ///
 /// Reorged blocks are removed from the cache.
 pub async fn cache_new_blocks_task<St, N: NodePrimitives>(