diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
index 21708ab4ec6..d2249c2147f 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -378,13 +378,9 @@ def send_emails(document_name, from_scheduler=False, posting_date=None):
 			attachments = [{"fname": filename + ".pdf", "fcontent": report_pdf}]
 
 			recipients, cc = get_recipients_and_cc(customer, doc)
-<<<<<<< HEAD
-			context = get_context(customer, doc)
-=======
 			if not recipients:
 				continue
-
->>>>>>> 5c2a949593 (feat: add field for specifying pdf name)
+				
 			subject = frappe.render_template(doc.subject, context)
 			message = frappe.render_template(doc.body, context)