diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index 58532116e6..3568c30207 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -5786,60 +5786,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     execution_payload_value,
                 )
             }
-            BeaconState::Gloas(_) => {
-                let (
-                    payload,
-                    kzg_commitments,
-                    maybe_blobs_and_proofs,
-                    maybe_requests,
-                    execution_payload_value,
-                ) = block_contents
-                    .ok_or(BlockProductionError::MissingExecutionPayload)?
-                    .deconstruct();
-
-                (
-                    BeaconBlock::Gloas(BeaconBlockGloas {
-                        slot,
-                        proposer_index,
-                        parent_root,
-                        state_root: Hash256::zero(),
-                        body: BeaconBlockBodyGloas {
-                            randao_reveal,
-                            eth1_data,
-                            graffiti,
-                            proposer_slashings: proposer_slashings
-                                .try_into()
-                                .map_err(BlockProductionError::SszTypesError)?,
-                            attester_slashings: attester_slashings_electra
-                                .try_into()
-                                .map_err(BlockProductionError::SszTypesError)?,
-                            attestations: attestations_electra
-                                .try_into()
-                                .map_err(BlockProductionError::SszTypesError)?,
-                            deposits: deposits
-                                .try_into()
-                                .map_err(BlockProductionError::SszTypesError)?,
-                            voluntary_exits: voluntary_exits
-                                .try_into()
-                                .map_err(BlockProductionError::SszTypesError)?,
-                            sync_aggregate: sync_aggregate
-                                .ok_or(BlockProductionError::MissingSyncAggregate)?,
-                            execution_payload: payload
-                                .try_into()
-                                .map_err(|_| BlockProductionError::InvalidPayloadFork)?,
-                            bls_to_execution_changes: bls_to_execution_changes
-                                .try_into()
-                                .map_err(BlockProductionError::SszTypesError)?,
-                            blob_kzg_commitments: kzg_commitments
-                                .ok_or(BlockProductionError::InvalidPayloadFork)?,
-                            execution_requests: maybe_requests
-                                .ok_or(BlockProductionError::MissingExecutionRequests)?,
-                        },
-                    }),
-                    maybe_blobs_and_proofs,
-                    execution_payload_value,
-                )
-            }
+            BeaconState::Gloas(_) => todo!("Gloas block production"),
         };
 
         let block = SignedBeaconBlock::from_block(
diff --git a/consensus/types/src/light_client_bootstrap.rs b/consensus/types/src/light_client_bootstrap.rs
index d73f327729..9fc51173a0 100644
--- a/consensus/types/src/light_client_bootstrap.rs
+++ b/consensus/types/src/light_client_bootstrap.rs
@@ -234,17 +234,7 @@ impl<E: EthSpec> LightClientBootstrap<E> {
                     .try_into()
                     .map_err(Error::SszTypesError)?,
             }),
-<<<<<<< HEAD
             ForkName::Gloas => todo!("Gloas light client not implemented"),
-=======
-            ForkName::Gloas => Self::Gloas(LightClientBootstrapGloas {
-                header: LightClientHeaderGloas::block_to_light_client_header(block)?,
-                current_sync_committee,
-                current_sync_committee_branch: current_sync_committee_branch
-                    .try_into()
-                    .map_err(Error::SszTypesError)?,
-            }),
->>>>>>> 0507eca7b4dfc6e923b02197d3f3f68bdeb1e67c
         };
 
         Ok(light_client_bootstrap)