From 906bd8f9a7cef85750ee653f300b33328ad3348a Mon Sep 17 00:00:00 2001
From: Kaushal Kumar <ravi.kaushal97@gmail.com>
Date: Fri, 6 Oct 2023 13:51:22 -0700
Subject: [PATCH] rebase with upstream main

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
---
 .../search/backpressure/stats/SearchShardTaskStats.java       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/src/main/java/org/opensearch/search/backpressure/stats/SearchShardTaskStats.java b/server/src/main/java/org/opensearch/search/backpressure/stats/SearchShardTaskStats.java
index a08baa457ab86..ffe97d125b27a 100644
--- a/server/src/main/java/org/opensearch/search/backpressure/stats/SearchShardTaskStats.java
+++ b/server/src/main/java/org/opensearch/search/backpressure/stats/SearchShardTaskStats.java
@@ -103,11 +103,7 @@ public boolean equals(Object o) {
         SearchShardTaskStats that = (SearchShardTaskStats) o;
         return cancellationCount == that.cancellationCount
             && limitReachedCount == that.limitReachedCount
-<<<<<<< HEAD
-            && completionCount == completionCount
-=======
             && completionCount == that.completionCount
->>>>>>> 3324fa1aaea (add taskCompletionCount in search_backpressure)
             && resourceUsageTrackerStats.equals(that.resourceUsageTrackerStats);
     }