diff --git a/src/libmtime_hl.f90 b/src/libmtime_hl.f90
index 8199d97cc60f7a7fa0b201d2c65aa84a4f69bcf8..440a3cc91a1b14f3a2bf9c26961789ec23350189 100644
--- a/src/libmtime_hl.f90
+++ b/src/libmtime_hl.f90
@@ -16,13 +16,10 @@ module mtime_hl
   
   private
 
-<<<<<<< Updated upstream
   PUBLIC :: t_datetime, t_timedelta
   PUBLIC :: t_timedeltaFromMilliseconds
-=======
-  public :: t_datetime, t_timedelta
-  public :: min, max
->>>>>>> Stashed changes
+  PUBLIC :: min, max
+
 
   integer, parameter :: i8 = selected_int_kind(14)   !< at least 8 byte integer