Update lib/router/router.rb

deal with  conflict