Resolve conflicts (#22905)

Co-authored-by: carllin <carl@solana.com>

program-test/src/lib.rs

@@ -431,7 +431,8 @@ fn setup_fees(bank: Bank) -> Bank {
         &[],     // transactions
         &mut [], // loaded accounts
         vec![],  // transaction execution results
-        0,       // tx count
+        0,       // executed tx count
+        0,       // executed with failure output tx count
         1,       // signature count
         &mut ExecuteTimings::default(),
     );