diff --git a/benches/circuit.rs b/benches/circuit.rs
index 05759c837..12e86b84c 100644
--- a/benches/circuit.rs
+++ b/benches/circuit.rs
@@ -43,11 +43,7 @@ fn criterion_benchmark(c: &mut Criterion) {
                 )
                 .unwrap();
         }
-<<<<<<< HEAD
-        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap();
-=======
-        let bundle: Bundle<_, i64> = builder.build(rng).unwrap().unwrap().0;
->>>>>>> zsa1
+        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap().unwrap().0;
 
         let instances: Vec<_> = bundle
             .actions()
diff --git a/benches/note_decryption.rs b/benches/note_decryption.rs
index f8f2c2105..a70e28b57 100644
--- a/benches/note_decryption.rs
+++ b/benches/note_decryption.rs
@@ -73,11 +73,7 @@ fn bench_note_decryption(c: &mut Criterion) {
                 None,
             )
             .unwrap();
-<<<<<<< HEAD
-        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap();
-=======
-        let bundle: Bundle<_, i64> = builder.build(rng).unwrap().unwrap().0;
->>>>>>> zsa1
+        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap().unwrap().0;
         bundle
             .create_proof(&pk, rng)
             .unwrap()