Updated collections controller and nested video routesi inside collections
Fixed merge conflicts in routes and videos controller