diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5b5640f4..827b790a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,10 +55,6 @@ jobs:
         strategy:
             matrix:
                 php-version:
-<<<<<<< HEAD
-=======
-                    - '8.1'
->>>>>>> 3.x
                     - '8.2'
                     - '8.3'
                     - '8.4'