Fix rebase conflicts

Signed-off-by: Artur Ciocanu <artur.ciocanu@gmail.com>

Author: artur-ciocanu

sdk/src/main/java/io/dapr/client/DaprClientImpl.java

@@ -511,9 +511,9 @@ public <T> Flux<T> subscribeToTopic(String pubsubName, String topic, TypeRef<T>
    * {@inheritDoc}
    */
   @Override
-  public <T> Flux<T> subscribeToEvents(String pubsubName, String topic, TypeRef<T> type, Map<String, String> metadata) {
-    DaprProtos.SubscribeTopicEventsRequestInitialAlpha1.Builder initialRequestBuilder =
-        DaprProtos.SubscribeTopicEventsRequestInitialAlpha1.newBuilder()
+  public <T> Flux<T> subscribeToTopic(String pubsubName, String topic, TypeRef<T> type, Map<String, String> metadata) {
+    DaprPubsubProtos.SubscribeTopicEventsRequestInitialAlpha1.Builder initialRequestBuilder =
+        DaprPubsubProtos.SubscribeTopicEventsRequestInitialAlpha1.newBuilder()
             .setTopic(topic)
             .setPubsubName(pubsubName);