diff --git a/laborious/utils/repository/model_repository.py b/laborious/utils/repository/model_repository.py
index a4bd28f..07f0fc5 100644
--- a/laborious/utils/repository/model_repository.py
+++ b/laborious/utils/repository/model_repository.py
@@ -27,16 +27,8 @@ ARTIFACTS_PATH = "./tmp/artifacts"
 class MLFlowRepository():
     def __init__(self, host: str, username: str, password: str, logger: Logger):
 
-
-<< << << < HEAD
         # set tracking uri
         mlflow.set_tracking_uri(host)
-== == == =
-        self.model_serving = ModelServing(tracking_uri=host,
-                                          username=username, password=password,
-                                          logger=logger)
-        self.logger = logger
->>>>>> > eefd081(SIENTIAPDE-1222)
 
         environ["MLFLOW_TRACKING_USERNAME"] = username
         environ["MLFLOW_TRACKING_PASSWORD"] = password