diff --git a/dan/manager/training.py b/dan/manager/training.py
index 921f1c8a01dc0e228141edf5291bb70b491c004f..a1c3b1e43f57c7e22da6680cd162f2550ac7d79b 100644
--- a/dan/manager/training.py
+++ b/dan/manager/training.py
@@ -23,8 +23,10 @@ from tqdm import tqdm
 from dan.manager.metrics import MetricManager
 from dan.ocr.utils import LM_ind_to_str
 from dan.schedulers import DropoutScheduler
+
 try:
     import mlflow
+
     from dan.mlflow import logging_metrics, logging_tags_metrics
 except ImportError:
     pass
diff --git a/dan/utils.py b/dan/utils.py
index e11c2e85bdc013193be1771be228f10999b81800..50f7311d602c97e80c308637e1b8cb37d8c90f95 100644
--- a/dan/utils.py
+++ b/dan/utils.py
@@ -23,10 +23,7 @@ class MLflowNotInstalled(Exception):
     Raised when MLflow logging was requested but the module was not installed
     """
 
-<<<<<<< HEAD
 
-=======
->>>>>>> bf9cf44 (check if mlflow is available at runtime)
 def randint(low, high):
     """
     call torch.randint to preserve random among dataloader workers