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 6fb2d9890..465471715 100644
--- a/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
+++ b/packages/common/business_components/src/ui/map/searchBar/procSearchBar.tsx
@@ -48,9 +48,6 @@ export const ProcSearchBar = ({ gisMaps, facilityTypes }: SearchBarProps) => {
         text: f.properties.mctpv_korn_nm,
         val: f.properties.mctpv_cd,
       }))
-<<<<<<< HEAD
-      .sort((a, b) => a.text.localeCompare(b.text, 'ko'));
-=======
       .sort((a, b) => {
         // 커스텀 순서 정의
         const customOrder = [
@@ -88,7 +85,6 @@ export const ProcSearchBar = ({ gisMaps, facilityTypes }: SearchBarProps) => {
         // 둘 다 커스텀 순서에 없으면 기본 알파벳 순서
         return a.text.localeCompare(b.text, 'ko');
       });
->>>>>>> iipbs/common/main
     setSidoData([{ text: "시도", val: "0" }, ...list]);
   };