From 32ac56b5ea285d9bf861db868bd304ba4119817e Mon Sep 17 00:00:00 2001
From: Jackie Han <jkhanjob@gmail.com>
Date: Tue, 3 Sep 2024 13:05:51 -0700
Subject: [PATCH] resolve conflict

Signed-off-by: Jackie Han <jkhanjob@gmail.com>
---
 src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
index 9305e387a..ec0b174b9 100644
--- a/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
+++ b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java
@@ -994,7 +994,6 @@ public void testNullFixedValue() throws IOException {
                 null,
                 null,
                 null,
-                null,
                 null
             )
         );