diff --git a/erpnext/loan_management/doctype/loan/loan.json b/erpnext/loan_management/doctype/loan/loan.json
index c8bd71d19ab..dd723f38bdf 100644
--- a/erpnext/loan_management/doctype/loan/loan.json
+++ b/erpnext/loan_management/doctype/loan/loan.json
@@ -371,11 +371,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-10-20 08:28:16.796105",
-=======
  "modified": "2022-01-25 16:29:16.325501",
->>>>>>> c68c70f8bc (feat: Refund entry against loans)
  "modified_by": "Administrator",
  "module": "Loan Management",
  "name": "Loan",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 2f06307e142..0a7eb33f66b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -342,15 +342,9 @@ erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
 erpnext.patches.v13_0.update_tax_category_for_rcm
 erpnext.patches.v13_0.convert_to_website_item_in_item_card_group_template
 erpnext.patches.v13_0.agriculture_deprecation_warning
-<<<<<<< HEAD
 erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
 erpnext.patches.v13_0.hospitality_deprecation_warning
 erpnext.patches.v13_0.delete_bank_reconciliation_detail
 erpnext.patches.v13_0.update_sane_transfer_against
 erpnext.patches.v13_0.enable_provisional_accounting
-
-=======
-erpnext.patches.v14_0.delete_agriculture_doctypes
-erpnext.patches.v13_0.update_exchange_rate_settings
-erpnext.patches.v13_0.update_disbursement_account
->>>>>>> c68c70f8bc (feat: Refund entry against loans)
+erpnext.patches.v13_0.update_disbursement_account
\ No newline at end of file