diff --git a/beacon_node/lighthouse_network/src/service/utils.rs b/beacon_node/lighthouse_network/src/service/utils.rs
index ad407fc7f9..a9eaa002ff 100644
--- a/beacon_node/lighthouse_network/src/service/utils.rs
+++ b/beacon_node/lighthouse_network/src/service/utils.rs
@@ -264,15 +264,9 @@ pub(crate) fn create_whitelist_filter(
             add(SyncCommitteeMessage(SyncSubnetId::new(id)));
         }
         let blob_subnet_count = if spec.electra_fork_epoch.is_some() {
-<<<<<<< HEAD
-            spec.blob_sidecar_subnet_count
-        } else {
-            spec.blob_sidecar_subnet_count_electra
-=======
             spec.blob_sidecar_subnet_count_electra
         } else {
             spec.blob_sidecar_subnet_count
->>>>>>> 21978a8da4ceb5af202b5c75a6a240a7f5469f53
         };
         for id in 0..blob_subnet_count {
             add(BlobSidecar(id));
diff --git a/beacon_node/lighthouse_network/src/types/topics.rs b/beacon_node/lighthouse_network/src/types/topics.rs
index e4a4f7dd68..21263618d2 100644
--- a/beacon_node/lighthouse_network/src/types/topics.rs
+++ b/beacon_node/lighthouse_network/src/types/topics.rs
@@ -59,11 +59,7 @@ pub fn fork_core_topics<E: EthSpec>(fork_name: &ForkName, spec: &ChainSpec) -> V
         ForkName::Electra => {
             // All of electra blob topics are core topics
             let mut electra_blob_topics = Vec::new();
-<<<<<<< HEAD
-            for i in 0..spec.blob_sidecar_subnet_count {
-=======
             for i in 0..spec.blob_sidecar_subnet_count_electra {
->>>>>>> 21978a8da4ceb5af202b5c75a6a240a7f5469f53
                 electra_blob_topics.push(GossipKind::BlobSidecar(i));
             }
             electra_blob_topics