diff --git a/pytorch_lightning/callbacks/model_checkpoint.py b/pytorch_lightning/callbacks/model_checkpoint.py
index 70999d3a49284f..34293f21fbca2a 100644
--- a/pytorch_lightning/callbacks/model_checkpoint.py
+++ b/pytorch_lightning/callbacks/model_checkpoint.py
@@ -416,16 +416,7 @@ def on_validation_end(self, trainer, pl_module):
                 self._del_model(self.last_model_path)
 
     def _do_check_save(
-<<<<<<< HEAD
         self, filepath: str, current: torch.Tensor, epoch: int, trainer, pl_module
-=======
-        self,
-        filepath: str,
-        current: torch.Tensor,
-        epoch: int,
-        trainer,
-        pl_module,
->>>>>>> Update model_checkpoint.py
     ):
         # remove kth
 
@@ -461,13 +452,7 @@ def _do_check_save(
                 if cur_path != filepath:
                     self._del_model(cur_path)
 
-<<<<<<< HEAD
     def on_save_checkpoint(self, trainer, pl_module) -> Dict[str, Any]:
-=======
-    def on_save_checkpoint(
-        self, trainer, pl_module
-    ) -> Dict[str, Any]:
->>>>>>> Update model_checkpoint.py
         return {
             "best_model_score": self.best_model_score,
             "best_model_path": self.best_model_path,