diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index cf847de2187..768c254c7f6 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -614,6 +614,7 @@
   },
   {
    "default": "3600",
+   "depends_on": "eval: !doc.use_legacy_controller_for_pcv",
    "description": "Timeout (in seconds) for each background job enqueued by Process Period Closing Voucher",
    "fieldname": "pcv_job_timeout",
    "fieldtype": "Int",
@@ -756,7 +757,11 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2026-06-15 18:26:50.778723",
+=======
+ "modified": "2026-06-24 12:59:41.868865",
+>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
index 716bd8a0719..9b4c16848b8 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
@@ -90,6 +90,11 @@ class AccountsSettings(Document):
 		make_payment_via_journal_entry: DF.Check
 		merge_similar_account_heads: DF.Check
 		over_billing_allowance: DF.Currency
+<<<<<<< HEAD
+=======
+		pcv_job_timeout: DF.Int
+		preview_mode: DF.Check
+>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)
 		receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"]
 		receivable_payable_remarks_length: DF.Int
 		reconciliation_queue_size: DF.Int
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4f129c918f0..f28ca0faf6b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -484,3 +484,8 @@ erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates
 erpnext.patches.v16_0.clear_procedures_from_receivable_report
 erpnext.patches.v16_0.migrate_address_contact_custom_fields
 erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
+<<<<<<< HEAD
+=======
+erpnext.patches.v16_0.set_default_close_opportunity_after_days
+execute:frappe.db.set_single_value("Accounts Settings", "pcv_job_timeout", 3600)
+>>>>>>> 3da7eefebb (refactor: patch, display depends on and json changes)