track changed routes
merged routes
changed yml
resolved conflicts

Conflicts:
	config/routes.rb
cleared conflicts
fixed duplicate of rename