add reset password
conflict
code cleaning