From 3572a51fdc9afcaa53bc3e4b0a6de895d356b3e3 Mon Sep 17 00:00:00 2001
From: Tit Petric <tit@tyk.io>
Date: Mon, 6 Nov 2023 10:22:00 +0100
Subject: [PATCH] Resolve conflict

---
 gateway/api_loader.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gateway/api_loader.go b/gateway/api_loader.go
index 9b37300503a4..92991e4a184e 100644
--- a/gateway/api_loader.go
+++ b/gateway/api_loader.go
@@ -751,7 +751,6 @@ func (gw *Gateway) loadHTTPService(spec *APISpec, apisByListen map[string]int, g
 		spec.Proxy.ListenPath,
 	}
 
-<<<<<<< HEAD
 	// Register routes for each prefixe
 	for _, prefix := range prefixes {
 		subrouter := router.PathPrefix(prefix).Subrouter()
@@ -767,10 +766,6 @@ func (gw *Gateway) loadHTTPService(spec *APISpec, apisByListen map[string]int, g
 		// Attach handlers
 		subrouter.NewRoute().Handler(httpHandler)
 	}
-=======
-	httpHandler := explicitRouteSubpaths(spec.Proxy.ListenPath, chainObj.ThisHandler, gwConfig.HttpServerOptions.EnableStrictRoutes)
-	subrouter.NewRoute().Handler(httpHandler)
->>>>>>> 213ac5b3... [TT-9924]remove muxer, proxy from explicitRouteHandler (#5482)
 
 	return chainObj
 }