diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index b73d530..d06b837 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -8,12 +8,10 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
 		System.out.println("Start application");
-<<<<<<< HEAD
 		System.out.println("Develop_1 Console");
 		System.out.println("Develop_2 Console");
+		System.out.println("Develop_3 Console");
 		UserEntity.Show();
-
->>>>>>> Develop_1
 		SpringApplication.run(DemoApplication.class, args);
 	}