diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index d5d91fec6aa..2144ae00366 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1170,11 +1170,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-09-16 17:45:04.954055",
-=======
  "modified": "2022-11-17 12:34:36.033363",
->>>>>>> 5efbc2cbf8 (fix: make `is_internal_supplier` read-only)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",