merge schema

merge schema