merged update password