diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 2351864d2b..c544aeaf7a 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -26,7 +26,6 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
     with:
-<<<<<<< HEAD
       jdk-matrix: '[ "8", "11", "17", "18" ]'
       ff-jdk: '18'
       ff-goal: 'clean install site site:stage -P reporting -nsu -T3'