diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py
index f7da64e8e6f..543a8a194b8 100755
--- a/erpnext/setup/doctype/employee/employee.py
+++ b/erpnext/setup/doctype/employee/employee.py
@@ -185,12 +185,6 @@ class Employee(NestedSet):
 				throw(_("Please enter relieving date."))
 
 	def validate_for_enabled_user_id(self, enabled):
-<<<<<<< HEAD
-		if not self.status == "Active":
-			return
-
-=======
->>>>>>> 194d060f13 (fix: update user status depends on employee status)
 		if enabled is None:
 			frappe.throw(_("User {0} does not exist").format(self.user_id))