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 7bb564b066a..f7d9c2bb161 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -812,6 +812,11 @@
    "fieldtype": "Currency",
    "label": "Incoming Rate (Costing)",
    "no_copy": 1,
+<<<<<<< HEAD
+=======
+   "options": "Company:company:default_currency",
+   "precision": "6",
+>>>>>>> b31c3bd35d (chore: Increase incoming_rate field precision to 6)
    "print_hide": 1
   },
   {
@@ -841,7 +846,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2022-08-26 12:06:31.205417",
+=======
+ "modified": "2022-10-10 20:57:38.340026",
+>>>>>>> b31c3bd35d (chore: Increase incoming_rate field precision to 6)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",