diff --git a/docs/gateway-api-compatibility.md.md b/docs/gateway-api-compatibility.md.md
index 2dfa5c5f27..d0ce025dbf 100644
--- a/docs/gateway-api-compatibility.md.md
+++ b/docs/gateway-api-compatibility.md.md
@@ -87,16 +87,11 @@ Fields:
 	  * `headers` - partially supported. Only `Exact` type.
 	  * `queryParams` - partially supported. Only `Exact` type. 
 	  * `method` -  supported.
-<<<<<<< HEAD
 	* `filters`
 		* `type` - supported.
 		* `requestRedirect` - supported except for the experimental `path` field. If multiple filters with `requestRedirect` are configured, NGINX Kubernetes Gateway will choose the first one and ignore the rest. 
 		* `requestHeaderModifier`, `requestMirror`, `urlRewrite`, `extensionRef` - not supported.
-	* `backendRefs` - partially supported. Only a single backend ref without support for `weight`. Backend ref `filters` are not supported. NGINX Kubernetes Gateway will use the IP of the Service as a backend, not the IPs of the corresponding Pods. Watching for Service updates is not supported.
-=======
-	* `filters` - not supported.
 	* `backendRefs` - partially supported. Only a single backend ref without support for `weight`. Backend ref `filters` are not supported.
->>>>>>> 1697a08... Add support for dynamic upstreams
 * `status`
   * `parents`
 	* `parentRef` - supported.
diff --git a/internal/nginx/config/generator_test.go b/internal/nginx/config/generator_test.go
index 110252d645..6f7614e884 100644
--- a/internal/nginx/config/generator_test.go
+++ b/internal/nginx/config/generator_test.go
@@ -142,10 +142,7 @@ func TestGenerateForDefaultServers(t *testing.T) {
 
 func TestGenerateHTTPServers(t *testing.T) {
 	const (
-		backendAddr = "http://10.0.0.1:80"
-		certPath    = "/etc/nginx/secrets/cert"
-		http        = false
-		https       = true
+		certPath = "/etc/nginx/secrets/cert"
 	)
 
 	hr := &v1beta1.HTTPRoute{