fix(router): keep changes from the master.