diff --git a/ui_template/ui_template_locale_m2.ts b/ui_template/ui_template_locale_m2.ts
index e90310eac..ad7f6ee6e 100644
--- a/ui_template/ui_template_locale_m2.ts
+++ b/ui_template/ui_template_locale_m2.ts
@@ -191,7 +191,6 @@ export const ui_locales_m2 = {
   M02_HopyoImport: ["일위대가 불러오기", "Import unit-price sheets"],
   B01_Dashboard_CardPrecombo: ["일위대가", "Unit-cost items"],
   M02_PrecomboTitle: ["일위대가", "Unit-cost items"],
-<<<<<<< HEAD
   B01_Dashboard_CardSangeun: ["단가산출", "Unit-price analyses"],
   M02_SangeunTitle: ["단가산출", "Unit-price analyses"],
   M02_SangeunNone: ["단가산출 없음", "No unit-price analyses"],
@@ -208,10 +207,8 @@ export const ui_locales_m2 = {
     "단가산출 상세 표 · 고침 — 준비 중(717-2b)",
     "Unit-price detail table and editing — coming next (717-2b)",
   ],
-=======
   M02_PickStd: ["기준 목록", "Standard list"],
   M02_PickSangeun: ["단가산출", "Unit-cost calcs"],
   M02_PickElement: ["M01 요소", "M01 elements"],
   M02_PickMaterial: ["재료 고르기", "Pick a material"],
->>>>>>> origin/sub_laptop_7
 } as const;