diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 53ab28cb84b..7fa555d0ab9 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1547,11 +1547,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-11-22 12:44:29.935567",
-=======
- "modified": "2022-11-17 17:30:45.559785",
->>>>>>> 77105306f2 (feat: add incoterm to purchasing transactions)
+ "modified": "2022-11-27 16:28:45.559785",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 40d26c62b98..d45d9ee1844 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2098,24 +2098,12 @@
    "hide_seconds": 1,
    "label": "Write Off",
    "width": "50%"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "0",
-   "fieldname": "repost_required",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Repost Required",
-   "no_copy": 1,
-   "read_only": 1
   },
   {
    "fieldname": "incoterm",
    "fieldtype": "Link",
    "label": "Incoterm",
    "options": "Incoterm"
->>>>>>> 029f22c549 (feat: add incoterm to sales transactions)
   }
  ],
  "icon": "fa fa-file-text",