diff --git a/openstack/networking/v2/ports/urls_test.go b/openstack/networking/v2/ports/urls_test.go
index 7fadd4d..e36e9ae 100644
--- a/openstack/networking/v2/ports/urls_test.go
+++ b/openstack/networking/v2/ports/urls_test.go
@@ -10,7 +10,11 @@
 const endpoint = "http://localhost:57909/"
 
 func endpointClient() *gophercloud.ServiceClient {
+<<<<<<< HEAD
 	return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
+=======
+	return &gophercloud.ServiceClient{Endpoint: endpoint}
+>>>>>>> Renaming erroneous test files
 }
 
 func TestListURL(t *testing.T) {
diff --git a/openstack/networking/v2/subnets/urls_test.go b/openstack/networking/v2/subnets/urls_test.go
index aeeddf3..ba1515f 100644
--- a/openstack/networking/v2/subnets/urls_test.go
+++ b/openstack/networking/v2/subnets/urls_test.go
@@ -10,7 +10,11 @@
 const endpoint = "http://localhost:57909/"
 
 func endpointClient() *gophercloud.ServiceClient {
+<<<<<<< HEAD
 	return &gophercloud.ServiceClient{Endpoint: endpoint, ResourceBase: endpoint + "v2.0/"}
+=======
+	return &gophercloud.ServiceClient{Endpoint: endpoint}
+>>>>>>> Renaming erroneous test files
 }
 
 func TestListURL(t *testing.T) {