from @jzoldak : bok choy starts from a snapshot of the schema from the checked in files. Those are what we updated. It then applies migrations. So yes we should merge in those changes, because this will move up the starting point and every time the tests are run they'll do so more efficiently because there will be fewer migrations to apply.