scaffold
update scaffold
update MERGE schema, routes