solving conflicts by hand so no trillions of migrations are created
Merge branch 'django-migrations-hand-merge' into 330-gazeteer