fixing dotenv gem error in heroku
add new relic driver
resolve merge conflicts