diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
index e1a1ce0871e..44aa271846c 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.py
@@ -142,23 +142,10 @@ class AssetMovement(Document):
 	def update_asset_location_and_custodian(self, asset_id, location, employee):
 		asset = frappe.get_doc("Asset", asset_id)
 
-<<<<<<< HEAD
-		updates = {}
-		if employee and employee != asset.custodian:
-			updates["custodian"] = employee
-
-		elif not employee and asset.custodian:
-			updates["custodian"] = ""
-
-=======
 		if cstr(employee) != asset.custodian:
 			frappe.db.set_value("Asset", asset_id, "custodian", cstr(employee))
->>>>>>> 323d8eaccd (fix(asset movement): clear custodian if not present)
 		if location and location != asset.location:
-			updates["location"] = location
-
-		if updates:
-			frappe.db.set_value("Asset", asset_id, updates)
+			frappe.db.set_value("Asset", asset_id, "location", location)
 
 	def log_asset_activity(self, asset_id, location, employee):
 		if location and employee: