diff --git a/erpnext/loan_management/doctype/loan/loan.json b/erpnext/loan_management/doctype/loan/loan.json
index f8aa62c69ca..fe94e2cadd6 100644
--- a/erpnext/loan_management/doctype/loan/loan.json
+++ b/erpnext/loan_management/doctype/loan/loan.json
@@ -361,11 +361,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-10-12 18:10:32.360818",
-=======
  "modified": "2021-10-20 08:28:16.796105",
->>>>>>> 8116b9b62f (fix: Updates in term loan processing)
  "modified_by": "Administrator",
  "module": "Loan Management",
  "name": "Loan",
@@ -396,4 +392,4 @@
  "sort_field": "creation",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}