diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 1041ee7172b..59e72ced503 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -23,16 +23,12 @@ from erpnext.accounts.doctype.tax_withholding_category.tax_withholding_category
 	get_party_tax_withholding_details,
 )
 from erpnext.accounts.general_ledger import get_round_off_account_and_cost_center
-<<<<<<< HEAD
 from erpnext.accounts.party import (
 	CROSS_PARTY_FIELD_NO_MAP,
+	_get_party_details,
 	get_due_date,
 	get_party_account,
-	get_party_details,
 )
-=======
-from erpnext.accounts.party import _get_party_details, get_due_date, get_party_account
->>>>>>> efb8336bf8 (fix: remove ignore_permissions from get_party_details signature (#55491))
 from erpnext.accounts.utils import (
 	cancel_exchange_gain_loss_journal,
 	get_account_currency,
@@ -2270,9 +2266,9 @@ def make_delivery_note(source_name, target_doc=None):
 					"cost_center": "cost_center",
 				},
 				"postprocess": update_item,
-				"condition": lambda doc: doc.delivered_by_supplier != 1
-				and not doc.dn_detail
-				and doc.qty - doc.delivered_qty > 0,
+				"condition": lambda doc: (
+					doc.delivered_by_supplier != 1 and not doc.dn_detail and doc.qty - doc.delivered_qty > 0
+				),
 			},
 			"Sales Taxes and Charges": {"doctype": "Sales Taxes and Charges", "reset_value": True},
 			"Sales Team": {
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 2192e40d637..1747fe63480 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -74,7 +74,6 @@ class DuplicatePartyAccountError(frappe.ValidationError):
 
 @frappe.whitelist()
 def get_party_details(
-<<<<<<< HEAD
 	party=None,
 	account=None,
 	party_type="Customer",
@@ -84,30 +83,12 @@ def get_party_details(
 	price_list=None,
 	currency=None,
 	doctype=None,
-	ignore_permissions=False,
 	fetch_payment_terms_template=True,
 	party_address=None,
 	company_address=None,
 	shipping_address=None,
 	dispatch_address=None,
 	pos_profile=None,
-=======
-	party: str | None = None,
-	account: str | None = None,
-	party_type: str = "Customer",
-	company: str | None = None,
-	posting_date: str | None = None,
-	bill_date: str | None = None,
-	price_list: str | None = None,
-	currency: str | None = None,
-	doctype: str | None = None,
-	fetch_payment_terms_template: bool = True,
-	party_address: str | None = None,
-	company_address: str | None = None,
-	shipping_address: str | None = None,
-	dispatch_address: str | None = None,
-	pos_profile: str | None = None,
->>>>>>> efb8336bf8 (fix: remove ignore_permissions from get_party_details signature (#55491))
 ):
 	if not party:
 		return frappe._dict()