chore: resolve merge conflict and format conftest.py with black

Author: Subhrasameerdash

CHANGELOG.md

@@ -13,14 +13,11 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Standardize formatting of evm_address_test.py using Black for improved consistency and readability (#1529)
 - Formatted unit test files using Black.
 - Format `tests/unit/network_tls_test.py` with black for code style consistency (#1543)
-<<<<<<< HEAD
 - Format `tests/unit/conftest.py` with black for code style consistency. (#1522)
 - Format tests/unit/network_tls_test.py with black for code style consistency (#1543)
 - Formatted `ethereum_transaction_test.py` using Black.
 - Formatted client_test.py using Black.
-=======
 - Format `tests/unit/conftest.py` with black for code style consistency. (#1522)
->>>>>>> efcd5ff (chore: format conftest with black)
 
 ### Added
 - Added Windows setup guide for SDK developers (`docs/sdk_developers/training/setup/setup_windows.md`) with PowerShell installation instructions. (#1570)