diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index 62ffc79fee8..75513e10a68 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -423,6 +423,10 @@ class Subscription(Document):
 		invoice.to_date = self.current_invoice_end
 
 		invoice.flags.ignore_mandatory = True
+<<<<<<< HEAD
+=======
+
+>>>>>>> 9c27f9be1e (fix: document naming rule not working for subscription invoices (#27386))
 		invoice.set_missing_values()
 		invoice.save()