diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index b3fb51c4fb8..43e8e41f7f3 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1632,11 +1632,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-20 16:04:43.627183",
-=======
  "modified": "2024-05-23 16:35:54.905804",
->>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
@@ -1715,4 +1711,4 @@
  "title_field": "customer_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}