fix migration
change settings
settings heroku
change postgres
change postgres
add requirements
order settings
add requirements
change wsgi
return wsgi
import settings
ignore settings
fix conflicts