diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index ade73ac6530..21cda420f5a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1669,11 +1669,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-02-03 14:23:47.937128",
-=======
  "modified": "2026-02-05 20:45:16.964500",
->>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",