diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 5a095fbb7ea..9734e850a0c 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -279,7 +279,6 @@
    "label": "Discount (%) on Price List Rate with Margin",
    "oldfieldname": "adj_rate",
    "oldfieldtype": "Float",
-   "precision": "2",
    "print_hide": 1
   },
   {
@@ -842,7 +841,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2022-02-24 14:41:36.392560",
+=======
+ "modified": "2022-08-26 12:06:31.205417",
+>>>>>>> c42fef541a (chore: remove precision on discount_percentage of Sales Invoice Item)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",