update schema and change migration to work with master after merge