update switchyard [merge]