diff --git a/video_prediction_tools/main_scripts/main_train_models.py b/video_prediction_tools/main_scripts/main_train_models.py
index a93642776beeb7b6a8ad9db0968b9be08594fb4b..7dad59d4fc70f0abb82dfbe6fa3be466be8c1f03 100644
--- a/video_prediction_tools/main_scripts/main_train_models.py
+++ b/video_prediction_tools/main_scripts/main_train_models.py
@@ -418,7 +418,6 @@ class TrainModel(object):
         if self.video_model.__class__.__name__ == "VanillaConvLstmVideoPredictionModel":
             fetch_list = fetch_list + ["inputs"]
             self.saver_loss = fetch_list[-1]
-<<<<<<< HEAD
             self.saver_loss_name = "Total loss"
         if self.video_model.__class__.__name__ == "WeatherBenchModel":
             fetch_list = fetch_list + ["total_loss"]