From 13f74db7bfe1f7f64fbc3cd0ef09553719db8c88 Mon Sep 17 00:00:00 2001
From: Riya Saxena <riysaxen@amazon.com>
Date: Fri, 8 Mar 2024 17:43:29 -0800
Subject: [PATCH] fix merge conflixt

---
 .../securityanalytics/findings/FindingIT.java       | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java b/src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java
index 016d55740..a42611a7e 100644
--- a/src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java
+++ b/src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java
@@ -39,18 +39,7 @@
 import org.opensearch.securityanalytics.model.DetectorTrigger;
 
 import static java.util.Collections.emptyList;
-import static org.opensearch.securityanalytics.TestHelpers.netFlowMappings;
-import static org.opensearch.securityanalytics.TestHelpers.randomDetectorType;
-import static org.opensearch.securityanalytics.TestHelpers.randomDetectorWithTriggers;
-import static org.opensearch.securityanalytics.TestHelpers.randomDoc;
-import static org.opensearch.securityanalytics.TestHelpers.randomIndex;
-import static org.opensearch.securityanalytics.TestHelpers.windowsIndexMapping;
-import static org.opensearch.securityanalytics.TestHelpers.randomRuleWithNotConditionBoolAndNum;
-import static org.opensearch.securityanalytics.TestHelpers.randomRuleWithCriticalSeverity;
-import static org.opensearch.securityanalytics.TestHelpers.randomNetworkDoc;
-import static org.opensearch.securityanalytics.TestHelpers.randomDocForNotCondition;
-import static org.opensearch.securityanalytics.TestHelpers.randomDetectorWithInputs;
-import static org.opensearch.securityanalytics.TestHelpers.randomRuleWithNotCondition;
+import static org.opensearch.securityanalytics.TestHelpers.*;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.FINDING_HISTORY_INDEX_MAX_AGE;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.FINDING_HISTORY_MAX_DOCS;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.FINDING_HISTORY_RETENTION_PERIOD;