destroyed Street scaffold
Resolve merge conflict in routes.rb