solve conflict

src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java

@@ -2,7 +2,7 @@ package org.cmh.backend.UserManagement.controller;
 
 import jakarta.transaction.Transactional;
 import org.cmh.backend.UserManagement.service.UserManagementService;
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.UserManagement.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;

src/main/java/org/cmh/backend/UserManagement/model/User.java

@@ -1,4 +1,4 @@
-package org.cmh.backend.authentication.model;
+package org.cmh.backend.UserManagement.model;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java

@@ -1,6 +1,5 @@
 package org.cmh.backend.UserManagement.repository;
 import org.cmh.backend.UserManagement.model.Tenant;
-import org.cmh.backend.authentication.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java

@@ -1,11 +1,8 @@
 package org.cmh.backend.UserManagement.repository;
 
 
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.UserManagement.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java

@@ -1,7 +1,7 @@
 package org.cmh.backend.UserManagement.service;
 
 import org.cmh.backend.UserManagement.repository.UserManagementRepository;
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.UserManagement.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;

src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java

@@ -1,13 +0,0 @@
-package org.cmh.backend.authentication.controller;
-
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-class AuthenticationController {
-    @GetMapping("/hello")
-    public String hello(){
-        return "Hello SpringBoot!";
-    }
-}

src/main/java/org/cmh/backend/authentication/controller/UserController.java

@@ -1,6 +1,6 @@
 package org.cmh.backend.authentication.controller;
 
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.UserManagement.model.User;
 import org.cmh.backend.authentication.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

src/main/java/org/cmh/backend/authentication/repository/UserRepository.java

@@ -1,6 +1,6 @@
 package org.cmh.backend.authentication.repository;
 
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.UserManagement.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/org/cmh/backend/authentication/service/UserService.java

@@ -1,9 +1,8 @@
 package org.cmh.backend.authentication.service;
 
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.UserManagement.model.User;
 import org.cmh.backend.authentication.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 @Service