updated json
latest changes post conflict resolution
move to dependencies for heroku
updated heroku config