added conf for heroku
resolve conflict