fixed error in env variables
merging files before commit
fixed merging conflicts
commiting before pull
testing new heroku path