diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index ffdd8b358df..4edfcd11c89 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -696,11 +696,7 @@ class Asset(AccountsController):
 		purchase_document = self.get_purchase_document()
 		fixed_asset_account, cwip_account = self.get_fixed_asset_account(), self.get_cwip_account()
 
-<<<<<<< HEAD
-		if purchase_document and self.purchase_receipt_amount and self.available_for_use_date <= nowdate():
-=======
 		if purchase_document and self.purchase_amount and getdate(self.available_for_use_date) <= getdate():
->>>>>>> 31841b4ab2 (refactor: renamed purchase receipt amount field to purchase amount)
 			gl_entries.append(
 				self.get_gl_dict(
 					{