diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 85e0fb7..284ed5f 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -10,11 +10,9 @@ public class DemoApplication {
 		System.out.println("Start application");
 		System.out.println("Develop_1 Console");
 		System.out.println("Develop_2 Console");
-<<<<<<< HEAD
 		System.out.println("Develop_3 Console");
-
 		System.out.println("Develop4_Console");
->>>>>>> develop_4
+
 		UserEntity.Show();
 		SpringApplication.run(DemoApplication.class, args);
 	}