Resolve merge conflicts

beacon_node/beacon_chain/tests/payload_invalidation.rs

@@ -1438,7 +1438,7 @@ async fn weights_after_resetting_optimistic_status() {
         .canonical_head
         .fork_choice_write_lock()
         .proto_array_mut()
-        .set_all_blocks_to_optimistic::<E>(&rig.harness.chain.spec)
+        .set_all_blocks_to_optimistic::<E>()
         .unwrap();
 
     let new_weights = rig

beacon_node/beacon_chain/tests/store_tests.rs

@@ -2938,6 +2938,7 @@ async fn reproduction_unaligned_checkpoint_sync_pruned_payload() {
             wss_state,
             wss_block.clone(),
             wss_blobs_opt.clone(),
+            None,
             genesis_state,
         )
         .unwrap()
@@ -3088,6 +3089,7 @@ async fn weak_subjectivity_sync_test(
             } else {
                 None
             },
+            None,
             genesis_state,
         )
         .unwrap()