diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 0c50b4460e4..c4c5aad25ad 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -131,13 +131,6 @@ class Asset(AccountsController):
 		self.set_missing_values()
 		self.validate_gross_and_purchase_amount()
 		self.validate_finance_books()
-<<<<<<< HEAD
-=======
-
-	def before_save(self):
-		self.total_asset_cost = self.net_purchase_amount + self.additional_asset_cost
-		self.status = self.get_status()
->>>>>>> 20c2cb40d1 (fix: set status to Draft for auto-created assets from Purchase Receipt)
 
 		if not self.split_from:
 			self.prepare_depreciation_data()
@@ -159,7 +152,9 @@ class Asset(AccountsController):
 						)
 		self.validate_expected_value_after_useful_life()
 		self.set_total_booked_depreciations()
-		self.total_asset_cost = self.gross_purchase_amount
+
+	def before_save(self):
+		self.total_asset_cost = self.net_purchase_amount + self.additional_asset_cost
 		self.status = self.get_status()
 
 	def on_submit(self):
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index dc083849dca..4e05b974d16 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -422,13 +422,4 @@ execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_fo
 erpnext.patches.v15_0.add_company_payment_gateway_account
 erpnext.patches.v15_0.update_uae_zero_rated_fetch
 erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
-<<<<<<< HEAD
-=======
-erpnext.patches.v16_0.make_workstation_operating_components #1
-erpnext.patches.v16_0.set_reporting_currency
-erpnext.patches.v16_0.set_posting_datetime_for_sabb_and_drop_indexes
-erpnext.patches.v16_0.update_serial_no_reference_name
-erpnext.patches.v16_0.rename_subcontracted_quantity
-erpnext.patches.v16_0.add_new_stock_entry_types
 erpnext.patches.v15_0.set_asset_status_if_not_already_set
->>>>>>> 20c2cb40d1 (fix: set status to Draft for auto-created assets from Purchase Receipt)