Conflict resolved

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

@@ -8,6 +8,10 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
 		System.out.println("Start application");
+                System.out.println("My application");
+                System.out.println("TEST1");
+                System.out.println("You're up");
+                System.out.println("test2");
 		SpringApplication.run(DemoApplication.class, args);
 	}
 

src/main/java/com/example/demo/domain/UserEntity.java

@@ -0,0 +1,13 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package com.example.demo.domain;
+
+/**
+ *
+ * @author student
+ */
+public class UserEntity {
+    
+}

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

@@ -0,0 +1,13 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package com.example.demo;
+
+/**
+ *
+ * @author student
+ */
+public class test {
+    
+}