updated routes
resolved merge conflict