rozwiazano konflikty w DemoApplication.java

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

@@ -10,7 +10,14 @@ public class DemoApplication {
 	  System.out.println("Start application");
 		SpringApplication.run(DemoApplication.class, args);
 
+
+
+        System.out.println("No");
+
+        System.out.println("Yes");
+
         System.out.println("End application");
+
 	}
 
 }

src/main/java/controller/UserController.java

@@ -1,4 +1,5 @@
 package controller;
 
 public class UserController {
+    int username;
 }