resolve merge issues

beacon_node/beacon_chain/tests/tests.rs

@@ -686,7 +686,7 @@ async fn run_skip_slot_test(skip_slots: u64) {
             harness_a.chain.head_snapshot().beacon_block_root,
             harness_a.get_head_block(),
             NotifyExecutionLayer::Yes,
-                            || Ok(())
+            || Ok(()),
         )
         .await
         .unwrap();