fix heroku error
Merge branch 'production'