Migrations changed: Citizens to Single Table Inheritance
Schema merge conflict fixed