diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java
index 82aaa58..0b01882 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java
@@ -1432,8 +1432,6 @@
         tblFiReminderMailSent.setDateMailSent(new java.util.Date(Date.valueOf("2020-05-08").getTime()));
         return tblFiReminderMailSent;
     }
-
-<<<<<<< HEAD
     public static TblFailureInformationReminderMailSent mockTblFailureInformationReminderMailSentFuture(){
         TblFailureInformationReminderMailSent tblFiReminderMailSent = new TblFailureInformationReminderMailSent();
         tblFiReminderMailSent.setId(1L);
@@ -1443,8 +1441,6 @@
         return tblFiReminderMailSent;
     }
 
-=======
-
     public static  HtblFailureInformationStation mockHistTblFailureInformationStation() {
         HtblFailureInformationStation histTblFailureInfoStation = new HtblFailureInformationStation();
         histTblFailureInfoStation.setHid(299L);
@@ -1477,5 +1473,4 @@
         histFailureInfoGroupDto.setStationStationId("97531");
         return histFailureInfoGroupDto;
     }
->>>>>>> b7194dd99f8022a336a700d7d356cd0614ffdb97
 }