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 7c7109b30dc..28a2256e2ec 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -1009,15 +1009,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2025-09-04 11:08:25.583561",
-=======
- "modified": "2026-02-15 20:50:18.580088",
->>>>>>> 4499e974a0 (chore: do not show stock details if update stock is disabled)
-=======
  "modified": "2026-02-15 21:08:57.341638",
->>>>>>> cdc62e7327 (chore: do not show serial batch selector if not needed)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",