fix schema merging