Modified routes file
solve conflict in routes file