diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 4f7d706..845e11f 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -9,11 +9,8 @@ public class DemoApplication {
 	public static void main(String[] args) {
 		System.out.println("Start application");
 		System.out.println("Second line added");
-<<<<<<< HEAD
-		System.out.println("Hello world!");
-=======
 		System.out.println("Third line added");
->>>>>>> develop_4
+		System.out.println(new Date());
 		SpringApplication.run(DemoApplication.class, args);
 	}