From 93cb185194429ec1c53d7c17c52712d8871aa82a Mon Sep 17 00:00:00 2001
From: yujin-emma <yujin.emma.work@gmail.com>
Date: Mon, 5 Feb 2024 23:03:48 +0000
Subject: [PATCH] fix the left test conflict

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
---
 .../check_conflict_for_data_source.test.ts      | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts b/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts
index 70a61657bd5d..8958c3339473 100644
--- a/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts
+++ b/src/core/server/saved_objects/import/check_conflict_for_data_source.test.ts
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
 <<<<<<< HEAD
  * Copyright OpenSearch Contributors
@@ -76,20 +81,12 @@ const obj1 = createObject('type-1', 'id-1'); // -> success
 const obj2 = createObject('type-2', 'id-2'); // -> conflict
 const obj3 = createObject('type-3', 'id-3'); // -> unresolvable conflict
 const obj4 = createObject('type-4', 'id-4'); // -> invalid type
-<<<<<<< HEAD
 const dataSourceObj = createObject('data-source', 'data-source-id-1'); // -> data-source type, no need to add in the filteredObjects
 const objects = [obj1, obj2, obj3, obj4];
 const dataSourceObj1 = createObject('type-1', 'ds_id-1'); // -> object with data source id
 const dataSourceObj2 = createObject('type-2', 'ds_id-2'); // -> object with data source id
 const objectsWithDataSource = [dataSourceObj, dataSourceObj1, dataSourceObj2];
 const dataSourceObj1Error = getResultMock.conflict(dataSourceObj1.type, dataSourceObj1.id);
-=======
-const dsObj = createObject('data-source', 'data-source-id-1'); // -> data-source type, no need to add in the filteredObjects
-const objects = [obj1, obj2, obj3, obj4];
-const dsObj1 = createObject('type-1', 'ds_id-1'); // -> object with data source id
-const dsObj2 = createObject('type-2', 'ds_id-2'); // -> object with data source id
-const objectsWithDataSource = [dsObj, dsObj1, dsObj2];
-const dsObj1Error = getResultMock.conflict(dsObj1.type, dsObj1.id);
 
 describe('#checkConflictsForDataSource', () => {
   const setupParams = (partial: {
@@ -158,7 +155,7 @@ describe('#checkConflictsForDataSource', () => {
           {
             ...dataSourceObj2,
             id: 'currentDsId_id-2',
-          }
+          },
         ],
         errors: [],
         importIdMap: new Map([
@@ -174,7 +171,7 @@ describe('#checkConflictsForDataSource', () => {
         pendingOverwrites: new Set([
           `${dataSourceObj1.type}:${dataSourceObj1.id}`,
           `${dataSourceObj2.type}:${dataSourceObj2.id}`,
-        ])
+        ]),
       })
     );
   });