Fix merge

1 files changed, 2 insertions, 12 deletions

diff --git a/test/core/end2end/invalid_call_argument_test.c b/test/core/end2end/invalid_call_argument_test.c
index 8df64b9e74..e9a31f278c 100644
--- a/test/core/end2end/invalid_call_argument_test.c
+++ b/test/core/end2end/invalid_call_argument_test.c
@@ -125,12 +125,8 @@ static void prepare_test(int is_client) {
 }
 
 static void cleanup_test() {
-<<<<<<< HEAD
-  grpc_call_unref(g_state.call);
-=======
   grpc_completion_queue *shutdown_cq;
-  grpc_call_destroy(g_state.call);
->>>>>>> e412a180602753972ac496560322e224a5db987f
+  grpc_call_unref(g_state.call);
   cq_verifier_destroy(g_state.cqv);
   grpc_channel_destroy(g_state.chan);
   grpc_slice_unref(g_state.details);
@@ -138,16 +134,10 @@ static void cleanup_test() {
   grpc_metadata_array_destroy(&g_state.trailing_metadata_recv);
 
   if (!g_state.is_client) {
-<<<<<<< HEAD
-    grpc_call_unref(g_state.server_call);
-    grpc_server_shutdown_and_notify(g_state.server, g_state.cq, tag(1000));
-    GPR_ASSERT(grpc_completion_queue_pluck(g_state.cq, tag(1000),
-=======
     shutdown_cq = grpc_completion_queue_create_for_pluck(NULL);
-    grpc_call_destroy(g_state.server_call);
+    grpc_call_unref(g_state.server_call);
     grpc_server_shutdown_and_notify(g_state.server, shutdown_cq, tag(1000));
     GPR_ASSERT(grpc_completion_queue_pluck(shutdown_cq, tag(1000),
->>>>>>> e412a180602753972ac496560322e224a5db987f
                                            grpc_timeout_seconds_to_deadline(5),
                                            NULL)
                    .type == GRPC_OP_COMPLETE);