diff --git a/examples/fibonacci/script/bin/groth16_bn254.rs b/examples/fibonacci/script/bin/groth16_bn254.rs
index 4d8228f55..98e9fa96a 100644
--- a/examples/fibonacci/script/bin/groth16_bn254.rs
+++ b/examples/fibonacci/script/bin/groth16_bn254.rs
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 use sp1_sdk::{include_elf, utils, HashableKey, ProverClient, SP1Stdin};
-=======
-use sp1_sdk::{utils, HashableKey, ProverClient, SP1Stdin};
->>>>>>> origin/main
 
 /// The ELF we want to execute inside the zkVM.
 const ELF: &[u8] = include_elf!("fibonacci-program");
@@ -18,11 +14,7 @@ fn main() {
     stdin.write(&n);
 
     // Set up the pk and vk.
-<<<<<<< HEAD
-    let client = ProverClient::env();
-=======
-    let client = ProverClient::new();
->>>>>>> origin/main
+    let client = ProverClient::from_env();
     let (pk, vk) = client.setup(ELF);
     println!("vk: {:?}", vk.bytes32());
 
diff --git a/examples/fibonacci/script/bin/plonk_bn254.rs b/examples/fibonacci/script/bin/plonk_bn254.rs
index 5f1c404dc..48f9c51a3 100644
--- a/examples/fibonacci/script/bin/plonk_bn254.rs
+++ b/examples/fibonacci/script/bin/plonk_bn254.rs
@@ -1,14 +1,7 @@
-<<<<<<< HEAD
 use sp1_sdk::{include_elf, utils, HashableKey, ProverClient, SP1Stdin};
 
 /// The ELF we want to execute inside the zkVM.
 const ELF: &[u8] = include_elf!("fibonacci-program");
-=======
-use sp1_sdk::{utils, HashableKey, ProverClient, SP1Stdin};
-
-/// The ELF we want to execute inside the zkVM.
-const ELF: &[u8] = include_bytes!("../../program/elf/riscv32im-succinct-zkvm-elf");
->>>>>>> origin/main
 
 fn main() {
     // Setup logging.
@@ -21,11 +14,7 @@ fn main() {
     stdin.write(&n);
 
     // Set up the pk and vk.
-<<<<<<< HEAD
-    let client = ProverClient::env();
-=======
-    let client = ProverClient::new();
->>>>>>> origin/main
+    let client = ProverClient::from_env();
     let (pk, vk) = client.setup(ELF);
     println!("vk: {:?}", vk.bytes32());