diff --git a/.github/workflows/cli-minikit.yml b/.github/workflows/cli-minikit.yml
index 7b0cc6f047..4bcc14457a 100644
--- a/.github/workflows/cli-minikit.yml
+++ b/.github/workflows/cli-minikit.yml
@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:.github/workflows/cli-minikit.yml
 name: "cli: build & install minikit"
-========
-name: "cli: build & install onchainkit"
->>>>>>>> upstream/main:.github/workflows/cli-verify-onchainkit-template.yml
 
 on:
   pull_request:
@@ -54,14 +50,11 @@ jobs:
         run: |
           mkdir test-project
           cd test-project
-<<<<<<<< HEAD:.github/workflows/cli-minikit.yml
+          
           (sleep 1; echo ""; sleep 1; echo ""; sleep 1; echo -e "\033[D\n"; sleep 1; echo -e "\033[D\n") | ../packages/create-onchain/dist/esm/cli.js --mini
-========
-          (sleep 1; echo ""; sleep 1; echo ""; sleep 1; echo ""; sleep 1; echo -e "\033[D\n") | ../packages/create-onchain/dist/esm/cli.js
->>>>>>>> upstream/main:.github/workflows/cli-verify-onchainkit-template.yml
 
       - name: Install & Build test project
         working-directory: ./test-project/my-onchainkit-app
         run: |
           npm install
-          npm run build
\ No newline at end of file
+          npm run build