From d17ef07f0a2126b38226e592d4253e69d21f467a Mon Sep 17 00:00:00 2001
From: Tit Petric <tit@tyk.io>
Date: Mon, 6 Nov 2023 10:55:00 +0100
Subject: [PATCH] Resolve conflicts in util.go, util_test.go

---
 gateway/util.go      | 4 +---
 gateway/util_test.go | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/gateway/util.go b/gateway/util.go
index a72576d0d30..4d7d7871123 100644
--- a/gateway/util.go
+++ b/gateway/util.go
@@ -2,6 +2,7 @@ package gateway
 
 import (
 	"errors"
+	"net/url"
 	"os"
 
 	"github.com/TykTechnologies/tyk/apidef"
@@ -158,8 +159,6 @@ func shouldReloadSpec(existingSpec, newSpec *APISpec) bool {
 
 	return false
 }
-<<<<<<< HEAD
-=======
 
 // check if 2 maps are the same
 func areMapsEqual(a, b map[string]string) bool {
@@ -183,4 +182,3 @@ func containsEscapedChars(str string) bool {
 
 	return str != unescaped
 }
->>>>>>> 4346303f... [TT-9327] Decoding the URL request first, before handling any additional logic (#5345)
diff --git a/gateway/util_test.go b/gateway/util_test.go
index b107bb419c6..05d64daad07 100644
--- a/gateway/util_test.go
+++ b/gateway/util_test.go
@@ -215,8 +215,6 @@ func Test_shouldReloadSpec(t *testing.T) {
 		assertionHelper(t, tcs)
 	})
 }
-<<<<<<< HEAD
-=======
 
 func TestAreMapsEqual(t *testing.T) {
 	tests := []struct {
@@ -279,4 +277,3 @@ func TestContainsEscapedCharacters(t *testing.T) {
 		})
 	}
 }
->>>>>>> 4346303f... [TT-9327] Decoding the URL request first, before handling any additional logic (#5345)