add bcrypt
fix merge conflict