further address rebase issue

Author: sixpluszero

clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreIngestionTask.java

@@ -3426,9 +3426,7 @@ public void unsubscribeFromTopic(PubSubTopic topic, PartitionConsumptionState pa
    * leader-follower state vs the intended state when the message was polled. Thus, we use an increased timeout of up to
    * 30 minutes according to the maximum value of the metric consumer_records_producing_to_write_buffer_latency.
    */
-  void consumerUnSubscribeForStateTransition(
-      PubSubTopic topic,
-      PartitionConsumptionState partitionConsumptionState) {
+  void consumerUnSubscribeForStateTransition(PubSubTopic topic, PartitionConsumptionState partitionConsumptionState) {
     Instant startTime = Instant.now();
     int partitionId = partitionConsumptionState.getPartition();
     PubSubTopicPartition topicPartition = new PubSubTopicPartitionImpl(topic, partitionId);
@@ -4412,9 +4410,6 @@ public boolean hasAllPartitionReportedCompleted() {
 
     return true;
   }
-  public boolean isSeparatedRealtimeTopicEnabled() {
-    return isSeparatedRealtimeTopicEnabled;
-  }
 
   public boolean isSeparatedRealtimeTopicEnabled() {
     return isSeparatedRealtimeTopicEnabled;