fixed conflict

requirements.txt

@@ -1,68 +1,5 @@
-aiohttp==3.9.3
-aiosignal==1.3.1
-astroid==3.0.3
-attrs==23.2.0
-base58==2.1.1
-bitarray==2.9.2
-black==24.2.0
-certifi==2024.2.2
-charset-normalizer==2.1.1
-click==8.1.7
-cytoolz==0.12.3
-dill==0.3.8
-eth-abi==2.2.0
-eth-account==0.5.9
-eth-hash==0.6.0
-eth-keyfile==0.5.1
-eth-keys==0.3.4
-eth-rlp==0.2.1
-eth-typing==2.3.0
-eth-utils==1.9.5
-frozenlist==1.4.1
-hexbytes==0.3.1
-idna==3.6
-iniconfig==2.0.0
-ipfshttpclient==0.8.0a2
-isort==5.13.2
-jsonschema==4.21.1
-jsonschema-specifications==2023.12.1
-lru-dict==1.3.0
-mccabe==0.7.0
-mock==5.0.2
-multiaddr==0.0.9
-multidict==6.0.5
-mypy==1.8.0
-mypy-extensions==1.0.0
-netaddr==0.10.1
-packaging==23.2
-parsimonious==0.8.1
-pathspec==0.12.1
-platformdirs==4.2.0
-pluggy==1.4.0
-protobuf==3.19.5
-pyasn1==0.5.1
-pycryptodome==3.20.0
-pylint==3.0.3
 pytest==7.2.2
-pytest-mock==3.12.0
 python-dotenv==0.21.1
-python-mcs-sdk==0.3.2
-referencing==0.33.0
 requests==2.28.1
-requests-mock==1.10.0
 requests-toolbelt==0.10.1
-rlp==2.0.1
-rpds-py==0.17.1
-rsa==4.9
-six==1.16.0
-tomlkit==0.12.3
-toolz==0.12.1
-tqdm==4.64.1
-types-mock==5.1.0.3
-requests==2.28.1
-typing_extensions==4.9.0
-#urllib3==1.26.18
-varint==1.0.2
-web3==5.31.1
-websockets==9.1
-yarl==1.9.4
+web3==6.15.1