Conflicts: app/controllers/admin/sites_controller.rb
s Please enter the commit message for your changes. Lines starting