no message

src/i18n/en/importBom.json

@@ -11,7 +11,6 @@
   "Drink": "Drink",
   "Powder_Mixture": "Powder Mixture",
   "Base Score": "Base Score",
-<<<<<<< HEAD
   "BOM Status": "BOM Status",
   "BOM Status Active": "Active",
   "BOM Status Inactive": "Inactive",
@@ -20,23 +19,14 @@
   "Code": "BOM Code",
   "Name": "BOM Name",
   "Output Quantity": "Output Quantity",
+  "Output Quantity UOM": "Output Quantity UOM",
   "Type": "Type",
   "Loading BOM Detail...": "Loading BOM Detail...",
   "Basic Info": "Basic Info",
   "Edit": "Edit",
   "Loading...": "Loading...",
   "Save": "Save",
-  "Cancel": "Cancel"
-=======
-  "Basic Info": "Basic Info",
-  "Edit": "Edit",
-  "Save": "Save",
   "Cancel": "Cancel",
-  "Loading...": "Loading...",
-  "Saving...": "Saving...",
-  "Output Quantity": "Output Quantity",
-  "Output Quantity UOM": "Output Quantity UOM",
-  "Type": "Type",
   "Allergic Substances": "Allergic Substances",
   "Depth": "Depth",
   "Float": "Float",
@@ -62,5 +52,4 @@
   "Add": "Add",
   "Sequence": "Sequence",
   "Actions": "Actions"
->>>>>>> b40acc5190be9dbb2ffea2fc4dd5e784c80c7f43
 }