updated gemfile for bcrypt errors
fixed merge conflicts