7311: Fix up compile errors after merge

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

besu/src/test/java/org/hyperledger/besu/RunnerTest.java

@@ -159,7 +159,7 @@ public final class RunnerTest {
   @Test
   public void fullSyncFromGenesisUsingPeerTaskSystem() throws Exception {
     // set merge flag to false, otherwise this test can fail if a merge test runs first
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
 
     syncFromGenesis(SyncMode.FULL, getFastSyncGenesis(), true);
   }
@@ -175,7 +175,7 @@ public final class RunnerTest {
   @Test
   public void fastSyncFromGenesisUsingPeerTaskSystem() throws Exception {
     // set merge flag to false, otherwise this test can fail if a merge test runs first
-    MergeConfigOptions.setMergeEnabled(false);
+    MergeConfiguration.setMergeEnabled(false);
 
     syncFromGenesis(SyncMode.FAST, getFastSyncGenesis(), true);
   }

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/peertask/task/GetReceiptsFromPeerTask.java

@@ -103,7 +103,7 @@ public class GetReceiptsFromPeerTask
   }
 
   @Override
-  public Collection<PeerTaskRetryBehavior> getPeerTaskBehaviors() {
+  public Collection<PeerTaskRetryBehavior> getPeerTaskRetryBehaviors() {
     return List.of(
         PeerTaskRetryBehavior.RETRY_WITH_OTHER_PEERS, PeerTaskRetryBehavior.RETRY_WITH_SAME_PEER);
   }