changing routes file
fixing merge conflict
messing around