diff --git a/trading_system/binance_client.py b/trading_system/binance_client.py
index c8615e0..d27b9d7 100644
--- a/trading_system/binance_client.py
+++ b/trading_system/binance_client.py
@@ -46,13 +46,9 @@ class BinanceClient:
             redis_url=config.REDIS_URL,
             use_tls=config.REDIS_USE_TLS,
             ssl_cert_reqs=config.REDIS_SSL_CERT_REQS,
-<<<<<<< Current (Your changes)
-            ssl_ca_certs=config.REDIS_SSL_CA_CERTS
-=======
             ssl_ca_certs=config.REDIS_SSL_CA_CERTS,
             username=config.REDIS_USERNAME,
             password=config.REDIS_PASSWORD
->>>>>>> Incoming (Background Agent changes)
         )
         
     async def connect(self, timeout: int = None, retries: int = None):