fix: merge

.github/workflows/test.yaml

@@ -62,15 +62,8 @@ jobs:
 
         strategy:
             matrix:
-<<<<<<< HEAD
-                # TODO: Replace with macos-latest when works again.
-                #   https://github.com/actions/setup-python/issues/808
-                os: [ubuntu-latest, macos-12]   # eventually add `windows-latest`
-                python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
-=======
                 os: [ubuntu-latest, macos-latest]   # eventually add `windows-latest`
                 python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
->>>>>>> 3721525 (feat: support web3.py dependencies (#16))
 
         steps:
         - uses: actions/checkout@v4
@@ -88,7 +81,7 @@ jobs:
         - name: Run Tests
           run: pytest -m "not fuzzing" -n 0 -s --cov
           env:
-            TENDERLY_FORK_ID: ${{ secrets.TENDERLY_FORK_ID }}
+            TENDERLY_GATEWAY_ACCESS_KEY: ${{ secrets.TENDERLY_GATEWAY_ACCESS_KEY }}
 
 # NOTE: uncomment this block after you've marked tests with @pytest.mark.fuzzing
 #    fuzzing:

README.md

@@ -4,11 +4,7 @@ Ecosystem plugin for Tenderly support in Ape.
 
 ## Dependencies
 
-<<<<<<< HEAD
-- [python3](https://www.python.org/downloads) version 3.8 up to 3.12.
-=======
 - [python3](https://www.python.org/downloads) version 3.9 up to 3.13.
->>>>>>> 3721525 (feat: support web3.py dependencies (#16))
 
 ## Installation