Conflicts: app/views/organizations/_org_custom_right2.html.erb
Conflicts: db/schema.rb
Conflicts: app/views/organizations/_org_custom_header.html.erb