diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 021c9e19c15..4184bdaabb9 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -557,11 +557,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
-<<<<<<< HEAD
- "modified": "2023-11-23 12:11:04.128015",
-=======
  "modified": "2024-07-18 15:32:29.413598",
->>>>>>> e81373bb6a (chore: remove 'repost_required' from Journal Entry)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",
@@ -612,4 +608,4 @@
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index ac2047a54fd..c44afd555e0 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2178,11 +2178,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-06-07 16:49:32.458402",
-=======
  "modified": "2024-07-18 15:30:39.428519",
->>>>>>> 06c5334f2a (chore: remove stale 'repost_required' flag from sales invoice)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",