Conflicts: app/views/layouts/base_org2.html.erb
Conflicts: app/helpers/organizations_helper.rb app/views/layouts/base_org2.html.erb app/views/organizations/_org_content.html.erb