resolve merge conflict

runtime/src/bank/tests.rs

@@ -11954,25 +11954,8 @@ fn test_feature_activation_loaded_programs_recompilation_phase() {
         &feature::create_account(&Feature { activated_at: None }, feature_account_balance),
     );
 
-<<<<<<< HEAD
-    // Reroot to call LoadedPrograms::prune() and end the current recompilation phase
-    goto_end_of_slot(&bank);
-    bank_forks
-        .write()
-        .unwrap()
-        .insert(Arc::into_inner(bank).unwrap());
-    let bank = bank_forks.read().unwrap().working_bank();
-    bank_forks.read().unwrap().prune_program_cache(bank.slot);
-    bank_forks
-        .write()
-        .unwrap()
-        .set_root(bank.slot, &AbsRequestSender::default(), None);
-
-    // Advance to next epoch, which starts the next recompilation phase
-=======
     goto_end_of_slot(bank.clone());
-    // Advance to next epoch, which starts the recompilation phase
->>>>>>> a9509f56b7 (Feature - Epoch boundary recompilation phase (#33477))
+    // Advance to next epoch, which starts the next recompilation phase
     let bank = new_from_parent_next_epoch(bank, 1);
 
     // Execute after feature is enabled to check it was filtered out and reverified.