From 18ecdcb8e8d9f39b05e29c8b226c9ae8d2d1dca7 Mon Sep 17 00:00:00 2001
From: sahil buddharaju <sahilbud@amazon.com>
Date: Thu, 10 Aug 2023 14:37:02 -0700
Subject: [PATCH] fixed conflict

Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
---
 .../opensearch/action/search/AbstractSearchAsyncActionTests.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java b/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
index d05d13bca2b06..995407dc856dc 100644
--- a/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/AbstractSearchAsyncActionTests.java
@@ -34,6 +34,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.opensearch.Version;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.action.support.IndicesOptions;