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 29261e47627..5e7a75b8a3f 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -893,11 +893,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-14 18:34:10.479329",
-=======
  "modified": "2024-05-23 16:36:18.970862",
->>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",