diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py
index 89e6f4a455f..6c90489e61a 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.py
@@ -20,8 +20,6 @@ class AssetRepair(AccountsController):
 			self.set_stock_items_cost()
 		self.calculate_total_repair_cost()
 
-<<<<<<< HEAD
-=======
 	def validate_asset(self):
 		if self.asset_doc.status in ("Sold", "Fully Depreciated", "Scrapped"):
 			frappe.throw(
@@ -36,7 +34,6 @@ class AssetRepair(AccountsController):
 				_("Completion Date can not be before Failure Date. Please adjust the dates accordingly.")
 			)
 
->>>>>>> 5a82b723c2 (fix: post gl entry on completion date of asset repair)
 	def update_status(self):
 		if self.repair_status == "Pending":
 			frappe.db.set_value("Asset", self.asset, "status", "Out of Order")