update author
merge route.rb
update author
resolve conflict route.rb