merged schema again