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 8e19bc928b6..5a095fbb7ea 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -850,11 +850,6 @@
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
-<<<<<<< HEAD
  "sort_order": "DESC"
 }
-=======
- "sort_order": "DESC",
- "states": []
-}
->>>>>>> 0373914704 (fix: Commission not applied while making Sales Order from Quotation)
+