updated Gemfile.lock to resolve conflict