heroku env variables for database
merge error caused by an amend on last commit