fix conflicts

Author: taylorotwell

.github/workflows/tests.yml

@@ -28,6 +28,10 @@ jobs:
         ports:
           - 6379:6379
         options: --entrypoint redis-server
+      dynamodb:
+        image: amazon/dynamodb-local:latest
+        ports:
+          - 8888:8000
 
     strategy:
       fail-fast: true
@@ -68,11 +72,6 @@ jobs:
           max_attempts: 5
           command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
 
-      - name: Setup DynamoDB Local
-        uses: rrainn/[email protected]
-        with:
-          port: 8888
-
       - name: Execute tests
         continue-on-error: ${{ matrix.php > 8 }}
         run: vendor/bin/phpunit --verbose