fix conflict

2 files changed, 2 insertions, 2 deletions

diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h
index 7f0677b4e5..3e68cf3776 100644
--- a/include/grpc++/completion_queue.h
+++ b/include/grpc++/completion_queue.h
@@ -61,7 +61,7 @@ class CompletionQueueTag {
   // Called prior to returning from Next(), return value
   // is the status of the operation (return status is the default thing
   // to do)
-  virtual void FinalizeResult(void *tag, bool *status) = 0;
+  virtual void FinalizeResult(void **tag, bool *status) = 0;
 };
 
 // grpc_completion_queue wrapper class
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 02fb383394..6d014a55f3 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -142,7 +142,7 @@ class Server::MethodRequestData final : public CompletionQueueTag {
                    cq_, this));
   }
 
-  void FinalizeResult(void *tag, bool *status) override {}
+  void FinalizeResult(void **tag, bool *status) override {}
 
   class CallData {
    public: