diff --git a/apps/sn/app/(map-layout)/map/page.tsx b/apps/sn/app/(map-layout)/map/page.tsx
index a5e5016ff..d4580cba0 100644
--- a/apps/sn/app/(map-layout)/map/page.tsx
+++ b/apps/sn/app/(map-layout)/map/page.tsx
@@ -129,13 +129,8 @@ import FldngHstryDetailPanel from "./components/fldngHstry/FldngHstryDetailPanel
 import FldngHstryLayerSettingPanel from "./components/fldngHstry/FldngHstryLayerSettingPanel";
 import ExmnLayerSettingPanel from "./components/exmn/ExmnLayerSettingPanel";
 import LayerSettingCard from "./components/layerSetting/LayerSettingCard";
-<<<<<<< Updated upstream
-import { getExmnMapLayer } from "./components/exmn/exmnMapApi";
 import { useFloodPredictionMap } from "@/features/fldngPredcPrst/lib/use-flood-prediction-map";
-=======
 import { useExmnResultMap } from "./components/exmn/useExmnResultMap";
-import { getFloodRiskGradeClassName } from "@/features/fldngPredcPrst/ui/FldngPredcPrstPopupContent";
->>>>>>> Stashed changes
 import {
   EMPTY_EXMN_MAP_FILTERS,
   appendExmnResultControlNodes,