resolve conflicts

beacon_node/beacon_chain/src/payload_envelope_verification/import.rs

@@ -192,7 +192,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             signed_envelope,
             import_data,
             payload_verification_outcome,
-            self.spec.clone(),
         ))
     }
 

beacon_node/beacon_chain/src/payload_envelope_verification/mod.rs

@@ -136,7 +136,6 @@ impl<E: EthSpec> ExecutedEnvelope<E> {
         envelope: MaybeAvailableEnvelope<E>,
         import_data: EnvelopeImportData<E>,
         payload_verification_outcome: PayloadVerificationOutcome,
-        spec: Arc<ChainSpec>,
     ) -> Self {
         match envelope {
             MaybeAvailableEnvelope::Available(available_envelope) => {