fix
for heroku
fix OPTIONS error
merge