add pbkdf2 hashed password
hashed password
merging index.js
merged confilcts