diff --git a/.github/workflows/analyse.yaml b/.github/workflows/analyse.yaml
index 29b9b43..265fa6e 100644
--- a/.github/workflows/analyse.yaml
+++ b/.github/workflows/analyse.yaml
@@ -10,18 +10,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-<<<<<<< HEAD
-        os:
-          - "ubuntu-latest"
-        php:
-          - 8.3
-        dependencies:
-          - "highest"
-        experimental:
-          - false
-=======
         php: [8.3]
->>>>>>> 8.x
 
     name: PHP${{ matrix.php }} PHPStan & Pint
 
diff --git a/.github/workflows/audits.yaml b/.github/workflows/audits.yaml
index ac33e4d..edd3557 100644
--- a/.github/workflows/audits.yaml
+++ b/.github/workflows/audits.yaml
@@ -12,12 +12,6 @@ jobs:
         php:
           - 8.2
           - 8.3
-<<<<<<< HEAD
-          - 8.4
-        experimental:
-          - true
-=======
->>>>>>> 8.x
 
     name: PHP${{ matrix.php }}