Merge

Author: Daniel Vaseekaran

tests/e2e/go.mod

@@ -171,11 +171,7 @@ require (
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.45.0 // indirect
-<<<<<<< HEAD
-	golang.org/x/exp v0.0.0-20251113190631-e25ba8c21ef6 // indirect
-=======
 	golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
->>>>>>> b081262006b2c9084ee4265c97a336a4c8d5cb64
 	golang.org/x/mod v0.30.0 // indirect
 	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/oauth2 v0.33.0 // indirect