Remove old migrations. Add new polymorphic fields to User model
Pull from Master