merge routes from master