diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9532c54..d5d7a96f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,8 +3,11 @@ name: CI
 on:
   push:
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
 =======
     branches: [ main, feat/**, fix/**, docs/**, chore/** ]
+>>>>>>> origin/main
 >>>>>>> origin/main
   pull_request: