Conflicts: app/views/organizations/_org_member_list.html.erb app/views/organizations/setting.html.erb app/views/users/_project_news.html.erb