remove conflict change password mailer
upload avatar success