no message

src/i18n/en/common.json

@@ -18,13 +18,9 @@
     "No": "No",
     "Equipment Name": "Equipment Name",
     "Equipment Code": "Equipment Code",
-<<<<<<< Updated upstream
-    "ShopAndTruck": "ShopAndTruck",
-    "DO floor (supplier)": "DO floor (supplier)",
-=======
     "ShopAndTruck": "Shop & route management",
+    "DO floor (supplier)": "DO floor (supplier)",
     "Route Board": "Route board",
->>>>>>> Stashed changes
     "TruckLance Code is required": "TruckLance Code is required",
     "Truck shop details updated successfully": "Truck shop details updated successfully",
     "Failed to save truck shop details": "Failed to save truck shop details",

src/i18n/zh/common.json

@@ -449,11 +449,8 @@
     "Batch Count": "批數",
     "Shop": "店鋪",
     "ShopAndTruck": "店鋪路線管理",
-<<<<<<< Updated upstream
     "DO floor (supplier)": "送貨單樓層（供應商）",
-=======
     "Route Board": "車線看板",
->>>>>>> Stashed changes
     "Shop Information": "店鋪資訊",
     "Shop Name": "店鋪名稱",
     "Shop Branch": "店鋪分店",