diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
index 4b1f586b60c..51dc3674594 100644
--- a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
@@ -34,11 +34,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-01-13 13:40:41.479208",
-=======
  "modified": "2025-02-05 16:39:14.863698",
->>>>>>> f8ab021920 (fix: change voucher_type and voucher_no field type to data)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withheld Vouchers",