diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 5ee48a21006..f9a226f3734 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -244,11 +244,14 @@ def restore_asset(asset_name):
 	asset.set_status()
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 def get_gl_entries_on_asset_regain(
 	asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None
 ):
 =======
+=======
+>>>>>>> c6a7de0e54 (chore: add blank lines)
 def depreciate_asset(asset, date):
 	asset.flags.ignore_validate_update_after_submit = True
 	asset.prepare_depreciation_data(date_of_disposal=date)
@@ -334,8 +337,14 @@ def disposal_happens_in_the_future(posting_date_of_disposal):
 	return False
 
 
+<<<<<<< HEAD
 def get_gl_entries_on_asset_regain(asset, selling_amount=0, finance_book=None):
 >>>>>>> ff5cad1cd6 (fix: calculate depreciation properly on asset sale entry and scrap entry)
+=======
+def get_gl_entries_on_asset_regain(
+	asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None
+):
+>>>>>>> c6a7de0e54 (chore: add blank lines)
 	(
 		fixed_asset_account,
 		asset,