diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c1f930e5dd4..212e072f79f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -366,3 +366,22 @@ execute:frappe.db.set_single_value('E Commerce Settings', 'show_actual_qty', 1)
 erpnext.patches.v14_0.delete_orphaned_asset_movement_item_records
 erpnext.patches.v14_0.remove_cancelled_asset_capitalization_from_asset
 erpnext.patches.v14_0.enable_set_priority_for_pricing_rules #1
+<<<<<<< HEAD
+=======
+erpnext.patches.v15_0.rename_number_of_depreciations_booked_to_opening_booked_depreciations
+erpnext.patches.v15_0.add_default_operations
+erpnext.patches.v15_0.enable_old_serial_batch_fields
+erpnext.patches.v15_0.update_warehouse_field_in_asset_repair_consumed_item_doctype
+erpnext.patches.v15_0.update_asset_repair_field_in_stock_entry
+erpnext.patches.v15_0.update_total_number_of_booked_depreciations
+erpnext.patches.v15_0.do_not_use_batchwise_valuation
+erpnext.patches.v15_0.update_invoice_remarks
+erpnext.patches.v14_0.update_reports_with_range
+erpnext.patches.v15_0.drop_index_posting_datetime_from_sle
+erpnext.patches.v15_0.add_disassembly_order_stock_entry_type #1
+erpnext.patches.v15_0.set_standard_stock_entry_type
+erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
+erpnext.patches.v15_0.link_purchase_item_to_asset_doc
+erpnext.patches.v15_0.migrate_to_utm_analytics
+erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
+>>>>>>> c5889c5d2e (fix: patch to update Currency Exchange Settings for `frankfurter.app`)
diff --git a/erpnext/patches/v14_0/update_currency_exchange_settings_for_frankfurter.py b/erpnext/patches/v14_0/update_currency_exchange_settings_for_frankfurter.py
new file mode 100644
index 00000000000..a67c5a26237
--- /dev/null
+++ b/erpnext/patches/v14_0/update_currency_exchange_settings_for_frankfurter.py
@@ -0,0 +1,11 @@
+import frappe
+
+
+def execute():
+	settings = frappe.get_doc("Currency Exchange Settings")
+	if settings.service_provider != "frankfurter.app":
+		return
+
+	settings.set_parameters_and_result()
+	settings.flags.ignore_validate = True
+	settings.save()