Resolve merge conflict

Author: GideonBature

integration_test/tests/blockchain.rs

@@ -524,13 +524,6 @@ fn blockchain__scan_tx_out_set_modelled() {
     let _: ScanTxOutSetAbort = node.client.scan_tx_out_set_abort().expect("scantxoutset abort");
 }
 
-#[test]
-fn blockchain__verify_tx_out_proof__modelled() {
-    let node = Node::with_wallet(Wallet::Default, &[]);
-    node.fund_wallet();
-    verify_tx_out_proof(&node).unwrap();
-}
-
 #[test]
 fn blockchain__verify_chain() {
     let node = Node::with_wallet(Wallet::None, &[]);