Merged updates

Author: wakaleo

.github/workflows/playwright-tests.yml

@@ -25,9 +25,6 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
 
-<<<<<<< HEAD
-      # Step 3: Cache Maven dependencies to speed up future builds
-=======
       # Step 3: Install Maven 3.9.9
       - name: Setup Maven Action
         uses: s4u/[email protected]
@@ -42,7 +39,6 @@ jobs:
         run: mvn --version
 
       # Step 5: Cache Maven dependencies
->>>>>>> 155d405 (Added a plugin to set the github actions maven version)
       - name: Cache Maven dependencies
         uses: actions/cache@v3
         with: