fixed additional conflict in routes.php
fixed additional conflict in routes.php

Signed-off-by: Norman Lim <9c81182a0e61da0c9ee62e8b0cda2e251071fc32@hotmail.com>

dbCoolCats/Lab4-starter-routes,dbCoolCats/Lab4-starter-routes