update schema after merge