fix: resolve rebase conflicts with main branch

Add missing `local_close_group` argument to `verify_payment` calls in
replication handlers and the merkle underpayment test, and remove stale
conflict marker from handler.rs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: mickvandijke

src/payment/verifier.rs

@@ -1972,7 +1972,9 @@ mod tests {
             verifier.pool_cache.lock().put(pool_hash, info);
         }
 
-        let result = verifier.verify_payment(&xorname, Some(&tagged_proof)).await;
+        let result = verifier
+            .verify_payment(&xorname, Some(&tagged_proof), &[])
+            .await;
 
         assert!(
             result.is_err(),

src/replication/mod.rs

@@ -1059,7 +1059,7 @@ async fn handle_fresh_offer(
 
     // Gap 1: Validate PoP via PaymentVerifier.
     match payment_verifier
-        .verify_payment(&offer.key, Some(&offer.proof_of_payment))
+        .verify_payment(&offer.key, Some(&offer.proof_of_payment), &[])
         .await
     {
         Ok(status) if status.can_store() => {
@@ -1174,7 +1174,7 @@ async fn handle_paid_notify(
 
     // Gap 1: Validate PoP via PaymentVerifier.
     match payment_verifier
-        .verify_payment(&notify.key, Some(&notify.proof_of_payment))
+        .verify_payment(&notify.key, Some(&notify.proof_of_payment), &[])
         .await
     {
         Ok(status) if status.can_store() => {

src/storage/handler.rs

@@ -57,8 +57,6 @@ pub struct AntProtocol {
     /// Quote generator for creating storage quotes.
     /// Also handles merkle candidate quote signing via ML-DSA-65.
     quote_generator: Arc<QuoteGenerator>,
-<<<<<<< HEAD
-    /// Channel for notifying the replication engine about newly-stored chunks.
     /// Channel for notifying the replication engine about newly-stored chunks.
     fresh_write_tx: Option<mpsc::UnboundedSender<FreshWriteEvent>>,
     /// P2P node for local close-group lookups during quote and payment