diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index c0b1c596007..f181e897f10 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -696,6 +696,10 @@
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Scan Barcode",
+<<<<<<< HEAD
+=======
+   "length": 1,
+>>>>>>> 8d116fb9ff (fix: remove VARCHARs from Sales Invoice (#27136))
    "options": "Barcode"
   },
   {
@@ -2047,7 +2051,11 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
+<<<<<<< HEAD
  "modified": "2023-01-28 19:45:47.538163",
+=======
+ "modified": "2021-08-25 14:46:05.279588",
+>>>>>>> 8d116fb9ff (fix: remove VARCHARs from Sales Invoice (#27136))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",