reset password function
merge conflict