Actually fix merge-conflict ...

Signed-off-by: sschulz92 <[email protected]>

Author: sschulz92

.github/workflows/tests.yml

@@ -62,11 +62,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-<<<<<<< HEAD
-          java-version: '17'
-=======
           java-version: '21'
->>>>>>> github/master
 
       - uses: getgauge/setup-gauge@master
         with: