changed view added _merge, rippled to controllers/admin/content and routes.rb, need to start rspec on controller merge and then do model's merge