fix css of reset password
fix merge