Confilcts Resolved

src/main/java/com/example/demo/DemoApplication.java

@@ -8,6 +8,12 @@ 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");
+		UserEntity.Show();
+
+>>>>>>> Develop_1
 		SpringApplication.run(DemoApplication.class, args);
 	}