diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 22ad9300529..1b186352bfa 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1740,11 +1740,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-02-10 11:55:52.796522",
-=======
  "modified": "2026-03-02 00:42:18.834823",
->>>>>>> 9538a9870c (fix(accounts): add transaction time field)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",