Merge another file
diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c
index f25d9aa..c7b6aa1 100644
--- a/src/core/security/security_connector.c
+++ b/src/core/security/security_connector.c
@@ -316,12 +316,7 @@
c->base.is_client_side = 1;
c->base.url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME;
c->base.vtable = &fake_channel_vtable;
-<<<<<<< HEAD
- c->request_metadata_creds =
- grpc_call_credentials_ref(request_metadata_creds);
-=======
c->request_metadata_creds = grpc_call_credentials_ref(request_metadata_creds);
->>>>>>> master
c->check_call_host = fake_channel_check_call_host;
return c;
}