merge last schema changes