working with heroku on server
fixed json stringify for response
merge