update Gemfile.lock to merge with heroku