Fixed bcrypt conflict