diff --git a/src/main/java/co/jp/app/common/ApiResponse.java b/src/main/java/co/jp/app/common/ApiResponse.java
index e31a684..8935c64 100644
--- a/src/main/java/co/jp/app/common/ApiResponse.java
+++ b/src/main/java/co/jp/app/common/ApiResponse.java
@@ -2,9 +2,13 @@ package co.jp.app.common;
 
 
 public class ApiResponse<T> {
+    //状态判定
     private boolean success;
+    //状况码
     private int code;
+    //状态信息
     private String message;
+    //数据
     private T data;
 
     private ApiResponse(ResultCode resultCode, T data) {
diff --git a/src/main/java/co/jp/app/config/security/SecurityConfig.java b/src/main/java/co/jp/app/config/security/SecurityConfig.java
index 3bbfdd4..b0af187 100644
--- a/src/main/java/co/jp/app/config/security/SecurityConfig.java
+++ b/src/main/java/co/jp/app/config/security/SecurityConfig.java
@@ -1,9 +1,6 @@
 package co.jp.app.config.security;
 
-<<<<<<< HEAD
-=======
 import co.jp.app.config.security.filter.JwtAuthenticationFilter;
->>>>>>> 2aae88278c46cf937380317aae1f9d229bcb3c37
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -13,12 +10,12 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
-
-import co.jp.app.config.security.filter.JwtAuthenticationFilter;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
 public class SecurityConfig {
diff --git a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java
index 802300b..2156dd0 100644
--- a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java
+++ b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java
@@ -1,7 +1,12 @@
 package co.jp.app.config.security.filter;
 
+import co.jp.app.service.JwtService;
 import java.io.IOException;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.lang.NonNull;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -11,16 +16,6 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-<<<<<<< HEAD
-import co.jp.app.service.JwtService;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-
-=======
->>>>>>> 2aae88278c46cf937380317aae1f9d229bcb3c37
 @Component
 public class JwtAuthenticationFilter extends OncePerRequestFilter {