merge latest schema updates