diff --git a/internal/controller/proxy_controller.go b/internal/controller/proxy_controller.go
index 5da93e20..b9cdf9da 100644
--- a/internal/controller/proxy_controller.go
+++ b/internal/controller/proxy_controller.go
@@ -36,11 +36,7 @@ type ProxyContext struct {
 	Proto     string
 	Path      string
 	Method    string
-<<<<<<< HEAD
-	Type      RequestType
-=======
 	Type      AuthModuleType
->>>>>>> main
 	IsBrowser bool
 }