Got routes working
Deleted merge conflict