diff --git a/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json b/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
index 5fb65698235..ed98aea4a98 100644
--- a/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
+++ b/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
@@ -70,7 +70,11 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-09-14 01:20:48.588052",
+=======
+ "modified": "2025-07-29 13:09:57.323835",
+>>>>>>> c18d565d3e (fix: change modified timestamp so migrations work)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Scrap Item",