starting to work on change password
getting rid of conflict