the router PR has been merged, can you assure (in the commit) that router.js is in sync.