merging in new schema changes