diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java
index c059f05..5dbfd72 100644
--- a/src/main/java/co/jp/app/service/UserService.java
+++ b/src/main/java/co/jp/app/service/UserService.java
@@ -1,20 +1,8 @@
 package co.jp.app.service;
 
-<<<<<<< HEAD
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import co.jp.app.entity.UserEntity;
-import co.jp.app.repository.UserRepository;
-import jakarta.transaction.Transactional;
-
-=======
->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e
 import java.util.Collection;
 import java.util.Collections;
 
-import co.jp.app.dto.RegistrationDto;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -22,28 +10,17 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
-<<<<<<< HEAD
-import co.jp.app.entity.PetEntity;
-import co.jp.app.repository.UploadRepository;
-=======
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e
+
+import co.jp.app.dto.RegistrationDto;
+import co.jp.app.entity.UserEntity;
+import co.jp.app.repository.UserRepository;
 
 @Service
 public class UserService implements UserDetailsService {
 
-<<<<<<< HEAD
-	private final UserRepository userEntityRepository;
-
-	@Autowired
-	public UserService(UserRepository userEntityRepository, PasswordEncoder passwordEncoder )
-	{
-		this.userEntityRepository = userEntityRepository;
-		this.passwordEncoder= passwordEncoder;
-
-=======
->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e
 	private final UserRepository userRepository;
 	private final PasswordEncoder passwordEncoder;
 
@@ -73,29 +50,17 @@ public class UserService implements UserDetailsService {
 		UserEntity userEntity = userRepository.findByEmail(email)
 				.orElseThrow(() -> new UsernameNotFoundException(email + " not found"));
 
-<<<<<<< HEAD
 		Collection<? extends GrantedAuthority> authorities = Collections
-				.singletonList(new SimpleGrantedAuthority("ROLE_USER")); // 示例：给所有用户一个ROLE_USER权限
-=======
-		Collection<? extends GrantedAuthority> authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e
+				.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
 
 		return new User(
 				userEntity.getEmail(),
 				userEntity.getPassword(),
-<<<<<<< HEAD
 				true, // enabled
 				true, // accountNonExpired
 				true, // credentialsNonExpired
 				true, // accountNonLocked
-				authorities // 用户的权限集合
-=======
-				true,                // enabled
-				true,                       // accountNonExpired
-				true,                       // credentialsNonExpired
-				true,                       // accountNonLocked
-				authorities                 // role
->>>>>>> 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e
+				authorities // role
 		);
 	}
-}
+}
\ No newline at end of file
diff --git a/target/classes/co/jp/app/config/security/SecurityConfig.class b/target/classes/co/jp/app/config/security/SecurityConfig.class
index fb3a4d7..d5567d7 100644
Binary files a/target/classes/co/jp/app/config/security/SecurityConfig.class and b/target/classes/co/jp/app/config/security/SecurityConfig.class differ