diff --git a/translations/base.json b/translations/base.json
index 5eb3808b3..90f36fd95 100644
--- a/translations/base.json
+++ b/translations/base.json
@@ -2557,7 +2557,6 @@
   "text_17291534666709ytr7mi4jjl": "Customers will receive an email reminder to pay their overdue balance based on the settings below.",
   "text_1729256593854oiy13slixjr": "Your overdue balance from {{companyName}}",
   "text_1728584028187udjepvgj8ra": "Preview email template",
-<<<<<<< HEAD
   "text_1729594310368kstqhifkf5p": "Close preview",
   "text_1729611609136sul07rowhfi": "Sync invoice to HubSpot",
   "text_1729613902412cy033eh4vvt": "HubSpot invoice url",
@@ -2606,13 +2605,11 @@
   "text_1730554642648qe9wjveh3fv": "Rounds a number based on the decimals value (e.g. 4.2 = 4 or 4.6 = 5)",
   "text_17305547268320wyhpbm8hh0": "Rounding rule",
   "text_1730554726832vyn9bep4u0f": "Precision (optional)",
-  "text_1729594310368kstqhifkf5p": "Close preview",
   "text_1729604107534r3hsj7i64gp": "Impact overridden subscriptions",
-  "text_17296041075348k56saczddu": "This plan is linked to overridden subscriptions, do you want to impact the changes made to these subscriptions?",
+  "text_17296041075348k56saczddu": "This plan is linked to overridden subscriptions. Any changes to a charge or filter will only apply to subscriptions that share the same price for that charge. Would you like to apply these changes to the relevant subscriptions?",
   "text_17296041075346803c5xv8um": "Do not impact overridden subscriptions",
   "text_1729604107534v8b3vembdla": "These changes will impact only non-overridden subscriptions.",
   "text_1729604107534vznb0h27kje": "Impact overridden subscriptions",
   "text_1729604107534rrec9gxuh54": "These changes will impact both overridden subscriptions and those not overridden.",
   "text_1729604107534dfyz8j53ho5": "Save editions"
 }
-