Fix incorrect conflict resolution

Author: OisinKyne

ethereum/src/config/networks.rs

@@ -251,9 +251,7 @@ pub fn hoodi() -> BaseConfig {
                 fork_version: fixed_bytes!("60000910"),
             },
         },
-        execution_forks: ForkSchedule {
-            prague_timestamp: 1742999832,
-        },
+        execution_forks: EthereumForkSchedule::hoodi(),
         max_checkpoint_age: 1_209_600, // 14 days
         #[cfg(not(target_arch = "wasm32"))]
         data_dir: Some(data_dir(Network::Hoodi)),