Modified routes/index
Merged manually