diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml
index 52a50cf..9ad4f79 100644
--- a/.github/workflows/cmake-single-platform.yml
+++ b/.github/workflows/cmake-single-platform.yml
@@ -1,11 +1,7 @@
 name: Smoketest
 on:
   push:
-<<<<<<< HEAD
-    branches: [ "main" ]
-=======
-    branches: [ "*" ]
->>>>>>> 59096e7 (updates github action)
+    branches: [ "main", "develop" ]
   pull_request:
     branches: [ "main" ]
 
@@ -44,8 +40,3 @@ jobs:
       working-directory: ${{github.workspace}}
       run: build/${{env.BUILD_TYPE}}/src/riscv-vp --isa 'rv32gc_msu' -v INFO -f fw/hello-world/hello.elf
 
-
-
-
-
-