diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index ae86ad114582686cce1d324df421cdfada78a7d7..ded10fb5cda41b89d746d8a198df2a3a59a59575 100644
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -50,13 +50,8 @@ package ui.util;
  */
 public class DefaultText {
 
-<<<<<<< HEAD
-    public static String BUILD = "12665";
-    public static String DATE = "2018/05/15 02:01:37 CET";
-=======
     public static String BUILD = "12663";
     public static String DATE = "2018/05/13 02:01:46 CET";
->>>>>>> parent of 632d5ad... update on build version: build.txt
 
     public static StringBuffer sbAbout = makeAbout();