finished updating users
fixed conflight in gemfile