Fix conflict

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_ethereum_config.rs

@@ -198,8 +198,6 @@ impl snowbridge_pallet_outbound_queue_v2::Config for Runtime {
 	type Helper = Runtime;
 }
 
-<<<<<<< HEAD
-=======
 #[cfg(not(any(feature = "std", feature = "fast-runtime", feature = "runtime-benchmarks", test)))]
 parameter_types! {
 	pub const ChainForkVersions: ForkVersions = ForkVersions {
@@ -234,7 +232,6 @@ parameter_types! {
 	};
 }
 
->>>>>>> c223162 (Snowbridge - Adds Fulu hardfork (#9938))
 #[cfg(any(feature = "std", feature = "fast-runtime", feature = "runtime-benchmarks", test))]
 parameter_types! {
 	pub const ChainForkVersions: ForkVersions = ForkVersions {
@@ -269,36 +266,6 @@ parameter_types! {
 	};
 }
 
-#[cfg(not(any(feature = "std", feature = "fast-runtime", feature = "runtime-benchmarks", test)))]
-parameter_types! {
-	pub const ChainForkVersions: ForkVersions = ForkVersions {
-		genesis: Fork {
-			version: hex!("90000069"),
-			epoch: 0,
-		},
-		altair: Fork {
-			version: hex!("90000070"),
-			epoch: 50,
-		},
-		bellatrix: Fork {
-			version: hex!("90000071"),
-			epoch: 100,
-		},
-		capella: Fork {
-			version: hex!("90000072"),
-			epoch: 56832,
-		},
-		deneb: Fork {
-			version: hex!("90000073"),
-			epoch: 132608,
-		},
-		electra: Fork {
-			version: hex!("90000074"),
-			epoch: 222464, // https://github.com/ethereum/EIPs/pull/9322/files
-		},
-	};
-}
-
 impl snowbridge_pallet_ethereum_client::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ForkVersions = ChainForkVersions;