merge schema changes
nits