diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d70c7bfd6a..34cd4acfd7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,13 +3,9 @@ name: CI # Run CI Checks
 on:
   pull_request:
     branches:
-<<<<<<< HEAD
-      - feat/percy-integration
-=======
       - main
       - v1
       - 'release/v2*'
->>>>>>> 93395596b529fb2e1bb7591e8d4792f1ff1de7ff
   merge_group:
     types: [checks_requested]