fixed schema merge