Resolved merge conflict

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

src/main/java/controller/UserController.java

@@ -0,0 +1,4 @@
+package controller;
+
+public class UserController {
+}

src/main/java/org/example/Main.java

@@ -6,7 +6,7 @@ import org.springframework.boot.SpringApplication;
 public class Main {
     public static void main(String[] args) {
         System.out.println("Start application");
-        System.out.println("Start application 3");
+        System.out.println("Start application 2");
         SpringApplication.run(Main.class, args);
     }
 }