no message

src/i18n/en/common.json

@@ -1,6 +1,5 @@
 {
     "Grade {{grade}}": "Grade {{grade}}",
-<<<<<<< Updated upstream
     "General Data": "General Data",
     "Repair and Maintenance": "Repair and Maintenance",
     "Repair and Maintenance Status": "Repair and Maintenance Status",