modified:   .gitignore
	modified:   app/controllers/admin/content_controller.rb
	modified:   app/views/admin/content/_merge.html.erb