diff --git a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
index 016774fdd..79e195925 100644
--- a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
+++ b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
@@ -88,11 +88,7 @@ export const ProcSearchBar = ({ gisMaps, facilityTypes }: SearchBarProps) => {
         text: f.properties.sgg_korn_nm,
         val: f.properties.sgg_cd,
       }))
-<<<<<<< HEAD
-      .sort((a, b) => a.text.localeCompare(b.text, 'ko'));
-=======
       .sort((a: any, b: any) => a.text.localeCompare(b.text, 'ko'));
->>>>>>> iipbs/common/main
     setSigunData(list);
   };
 
@@ -130,11 +126,7 @@ export const ProcSearchBar = ({ gisMaps, facilityTypes }: SearchBarProps) => {
           text: f.properties.swtrmt_fclt_nm ?? "(이름없음)",
           val: f.id,
         }))
-<<<<<<< HEAD
-        .sort((a, b) => a.text.localeCompare(b.text, 'ko'));
-=======
         .sort((a: any, b: any) => a.text.localeCompare(b.text, 'ko'));
->>>>>>> iipbs/common/main
     } else if (
       type === "tb_wr_bdst_ruse_fclt" // 재이용시설
     ) {