diff --git a/addon/init.py b/addon/init.py
index 208558f..284a90e 100644
--- a/addon/init.py
+++ b/addon/init.py
@@ -58,13 +58,7 @@ class NonceAddon:
 
     async def response(self, flow: http.HTTPFlow):
         try:
-<<<<<<< HEAD
             await self.checker.check_nonce_in_id_token(flow)
-=======
-            pass
-            # TODO id_token을 파싱하는 부분이 누락되어있습니다.
-            # await self.checker.check_nonce_in_id_token(flow)
->>>>>>> 99fc280517f09bb93d586c26f01239f32c04c56c
         except Exception as e:
             print(f"[ERROR] NonceAddon failed: {e}")
             pass