diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 3b8dc5e0ad0..d714df0927b 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -53,98 +53,6 @@ class InvalidPaymentEntry(ValidationError):
 
 
 class PaymentEntry(AccountsController):
-<<<<<<< HEAD
-=======
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		from erpnext.accounts.doctype.advance_taxes_and_charges.advance_taxes_and_charges import (
-			AdvanceTaxesandCharges,
-		)
-		from erpnext.accounts.doctype.payment_entry_deduction.payment_entry_deduction import (
-			PaymentEntryDeduction,
-		)
-		from erpnext.accounts.doctype.payment_entry_reference.payment_entry_reference import (
-			PaymentEntryReference,
-		)
-
-		advance_reconciliation_takes_effect_on: DF.Literal[
-			"Advance Payment Date", "Oldest Of Invoice Or Advance", "Reconciliation Date"
-		]
-		amended_from: DF.Link | None
-		apply_tax_withholding_amount: DF.Check
-		auto_repeat: DF.Link | None
-		bank: DF.ReadOnly | None
-		bank_account: DF.Link | None
-		bank_account_no: DF.ReadOnly | None
-		base_in_words: DF.SmallText | None
-		base_paid_amount: DF.Currency
-		base_paid_amount_after_tax: DF.Currency
-		base_received_amount: DF.Currency
-		base_received_amount_after_tax: DF.Currency
-		base_total_allocated_amount: DF.Currency
-		base_total_taxes_and_charges: DF.Currency
-		book_advance_payments_in_separate_party_account: DF.Check
-		clearance_date: DF.Date | None
-		company: DF.Link
-		contact_email: DF.Data | None
-		contact_person: DF.Link | None
-		cost_center: DF.Link | None
-		custom_remarks: DF.Check
-		deductions: DF.Table[PaymentEntryDeduction]
-		difference_amount: DF.Currency
-		in_words: DF.SmallText | None
-		is_opening: DF.Literal["No", "Yes"]
-		letter_head: DF.Link | None
-		mode_of_payment: DF.Link | None
-		naming_series: DF.Literal["ACC-PAY-.YYYY.-"]
-		paid_amount: DF.Currency
-		paid_amount_after_tax: DF.Currency
-		paid_from: DF.Link
-		paid_from_account_balance: DF.Currency
-		paid_from_account_currency: DF.Link
-		paid_from_account_type: DF.Data | None
-		paid_to: DF.Link
-		paid_to_account_balance: DF.Currency
-		paid_to_account_currency: DF.Link
-		paid_to_account_type: DF.Data | None
-		party: DF.DynamicLink | None
-		party_balance: DF.Currency
-		party_bank_account: DF.Link | None
-		party_name: DF.Data | None
-		party_type: DF.Link | None
-		payment_order: DF.Link | None
-		payment_order_status: DF.Literal["Initiated", "Payment Ordered"]
-		payment_type: DF.Literal["Receive", "Pay", "Internal Transfer"]
-		posting_date: DF.Date
-		print_heading: DF.Link | None
-		project: DF.Link | None
-		purchase_taxes_and_charges_template: DF.Link | None
-		received_amount: DF.Currency
-		received_amount_after_tax: DF.Currency
-		reconcile_on_advance_payment_date: DF.Check
-		reference_date: DF.Date | None
-		reference_no: DF.Data | None
-		references: DF.Table[PaymentEntryReference]
-		remarks: DF.SmallText | None
-		sales_taxes_and_charges_template: DF.Link | None
-		source_exchange_rate: DF.Float
-		status: DF.Literal["", "Draft", "Submitted", "Cancelled"]
-		target_exchange_rate: DF.Float
-		tax_withholding_category: DF.Link | None
-		taxes: DF.Table[AdvanceTaxesandCharges]
-		title: DF.Data | None
-		total_allocated_amount: DF.Currency
-		total_taxes_and_charges: DF.Currency
-		unallocated_amount: DF.Currency
-	# end: auto-generated types
-
->>>>>>> 8b2c981fc3 (refactor: introduce select fields in company and payment entry)
 	def __init__(self, *args, **kwargs):
 		super().__init__(*args, **kwargs)
 		if not self.is_new():
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c1b626502ac..a16f87de0dc 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -386,10 +386,5 @@ erpnext.patches.v14_0.update_stock_uom_in_work_order_item
 erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
 erpnext.patches.v15_0.enable_allow_existing_serial_no
 erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts
-<<<<<<< HEAD
-erpnext.patches.v15_0.update_asset_status_to_work_in_progress
-=======
-erpnext.patches.v15_0.refactor_closing_stock_balance #5
 erpnext.patches.v15_0.update_asset_status_to_work_in_progress
 erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect
->>>>>>> a8a8ac71b6 (refactor: patch to migrate checkbox to select)