bcrypt conflict fix