route to added in route file
merge conflct resolved for routes