fix merge conflicts

logic/auth.go

@@ -268,6 +268,10 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
 	if _, err := GetUser(user.UserName); err != nil {
 		return &models.User{}, err
 	}
+	err := ValidateUser(userchange)
+	if err != nil {
+		return &models.User{}, err
+	}
 
 	queryUser := user.UserName
 	if userchange.UserName != "" && user.UserName != userchange.UserName {
@@ -305,11 +309,11 @@ func UpdateUser(userchange, user *models.User) (*models.User, error) {
 	}
 	user.UserGroups = userchange.UserGroups
 	user.NetworkRoles = userchange.NetworkRoles
-	err := ValidateUser(user)
+	err = ValidateUser(user)
 	if err != nil {
 		return &models.User{}, err
 	}
-	if err := database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
+	if err = database.DeleteRecord(database.USERS_TABLE_NAME, queryUser); err != nil {
 		return &models.User{}, err
 	}
 	data, err := json.Marshal(&user)