resolve merge error

include/grpc++/completion_queue.h

@@ -86,9 +86,6 @@ class CompletionQueue {
 
   // Blocking (until deadline) read from queue.
   // Returns false if the queue is ready for destruction, true if event
-  bool Next(void** tag, bool* ok) {
-    return (AsyncNext(tag, ok, std::chrono::system_clock::time_point::max()) !=
-            SHUTDOWN);
 
   bool Next(void** tag, bool* ok) {
     return (
@@ -119,9 +116,10 @@ class CompletionQueue {
   friend class ::grpc::ServerReaderWriter;
   friend class ::grpc::Server;
   friend class ::grpc::ServerContext;
-    friend Status BlockingUnaryCall(
+  friend Status BlockingUnaryCall(ChannelInterface* channel,
-        ChannelInterface * channel, const RpcMethod& method,
+                                  const RpcMethod& method,
-        ClientContext* context, const grpc::protobuf::Message& request,
+                                  ClientContext* context,
+                                  const grpc::protobuf::Message& request,
                                   grpc::protobuf::Message* result);
 
   // Wraps grpc_completion_queue_pluck.