Conflicts: app/views/courses/_course_members.html.erb app/views/courses/settings.html.erb app/views/members/create.js.erb app/views/members/destroy.js.erb app/views/members/update.js.erb app/views/users/show.html.erb public/javascripts/course.js