diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml
index c3f124c..52a50cf 100644
--- a/.github/workflows/cmake-single-platform.yml
+++ b/.github/workflows/cmake-single-platform.yml
@@ -1,7 +1,11 @@
 name: Smoketest
 on:
   push:
+<<<<<<< HEAD
     branches: [ "main" ]
+=======
+    branches: [ "*" ]
+>>>>>>> 59096e7 (updates github action)
   pull_request:
     branches: [ "main" ]