solve couple of merge conflicts

beacon_node/beacon_chain/src/kzg_utils.rs

@@ -24,8 +24,9 @@ pub fn validate_blobs_sidecar<T: EthSpec>(
 
     let blobs = blobs_sidecar
         .blobs
+        .clone() // TODO(pawan): avoid this clone
         .into_iter()
-        .map(|blob| ssz_blob_to_crypto_blob::<T>(blob.clone())) // TODO(pawan): avoid this clone
+        .map(|blob| ssz_blob_to_crypto_blob::<T>(blob))
         .collect::<Vec<_>>();
 
     kzg.verify_aggregate_kzg_proof(

consensus/state_processing/src/per_block_processing.rs

@@ -180,15 +180,7 @@ pub fn per_block_processing<T: EthSpec, Payload: AbstractExecPayload<T>>(
         )?;
     }
 
-<<<<<<< HEAD
     process_blob_kzg_commitments(block.body(), ctxt)?;
-=======
-    // Eip4844 specifications are not yet released so additional care is taken
-    // to ensure the code does not run in production.
-    if matches!(block, BeaconBlockRef::Eip4844(_)) {
-        process_blob_kzg_commitments(block.body())?;
-    }
->>>>>>> unstable
 
     Ok(())
 }