Resolved merge conflict

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

@@ -9,8 +9,8 @@ public class DemoApplication {
 	public static void main(String[] args) {
 
 		System.out.println("Start application");
-		System.out.println("drugi komunikat");
 		System.out.println("trzei komunikat");
+		System.out.println("Drugi komunikat");
 		SpringApplication.run(DemoApplication.class, args);
 	}
 

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

@@ -0,0 +1,4 @@
+package com.example.demo.controller;
+
+public class UserController {
+}