Cleaned up merge conflicts from pulling wrong heroku app