diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
index a0dd7f9cb23..2afbfd03643 100644
--- a/.github/workflows/api-tests.yml
+++ b/.github/workflows/api-tests.yml
@@ -30,6 +30,7 @@ env:
   DOMAIN_NAME: demo-test
   USERS_URL: http://localhost:9002
   THINGS_URL: http://localhost:9000
+<<<<<<< HEAD
   INVITATIONS_URL: http://localhost:9020
   AUTH_URL: http://localhost:8189
 
@@ -60,7 +61,11 @@ jobs:
           echo "USER_TOKEN=$USER_TOKEN" >> $GITHUB_ENV
 
       - name: Check for changes in specific paths
+<<<<<<< HEAD
         uses: dorny/paths-filter@v3
+=======
+        uses: dorny/paths-filter@v2
+>>>>>>> 65c8a0e7 (NOISSUE - Add property based testing to things service (#2088))
         id: changes
         with:
           filters: |
@@ -135,6 +140,7 @@ jobs:
         with:
           schema: api/openapi/things.yml
           base-url: ${{ env.THINGS_URL }}
+<<<<<<< HEAD
           checks: all
           report: false
           args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'