Fix merge

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

Author: matthew1001

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftMiningAcceptanceTest.java

@@ -150,7 +150,8 @@ public void shouldMineOnSingleNodeWithFreeGas_London(
     cluster.verify(receiver.balanceEquals(3));
   }
 
-  @Test
+  @ParameterizedTest(name = "{index}: {0}")
+  @MethodSource("factoryFunctions")
   public void shouldMineOnSingleNodeWithFreeGas_Shanghai() throws Exception {
     final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
     updateGenesisConfigToShanghai(minerNode, true);
@@ -177,8 +178,6 @@ public void shouldMineOnSingleNodeWithFreeGas_Shanghai() throws Exception {
     cluster.verify(receiver.balanceEquals(3));
   }
 
-  @Test
-  public void shouldMineOnMultipleNodes() throws Exception {
   @ParameterizedTest(name = "{index}: {0}")
   @MethodSource("factoryFunctions")
   public void shouldMineOnMultipleNodes(