Fixed Merge Conflicts
Fixed Heroku specific errors
Fixed Heroku specific errors