fix merge conflict for migration and also add bcrypt-ruby gem