diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
index 5eb7a3f3d7f..fd94faa8cc9 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
@@ -699,7 +699,14 @@ def get_straight_line_or_manual_depr_amount(
 						)
 					),
 					add_days(
+<<<<<<< HEAD
 						get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)), 1
+=======
+						get_last_day(
+							add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)
+						),
+						1,
+>>>>>>> be0cb5289f (fix:linter issue)
 					),
 				)
 				+ 1