Conflict

src/main/java/com/lab1/demo/DemoApplication — kopia.java

@@ -0,0 +1,14 @@
+package com.lab1.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DemoApplication {
+
+	public static void main(String[] args) {
+		System.out.println("Start application");
+			SpringApplication.run(DemoApplication.class, args);
+	}
+
+}

src/main/java/com/lab1/demo/controller/UserController.java

@@ -0,0 +1,3 @@
+class UserController {
+
+}