Conflicts: app/views/layouts/base_org2.html.erb
Conflicts: app/views/organizations/_org_custom_right2.html.erb