diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 860e1ae9ed..962f651ace 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -162,7 +162,6 @@ jobs:
         run: |
           cd cli
           cargo install --locked --path .
-<<<<<<< HEAD
           cd ~
 
       - name: Run cargo prove new
@@ -176,6 +175,3 @@ jobs:
           cargo prove build
           cd ../script
           SP1_DEV=1 RUST_LOG=info cargo run --release 
-=======
-          cd ~
->>>>>>> dev