Conflicts: app/controllers/courses_controller.rb app/services/courses_service.rb app/views/courses/join.js.erb public/stylesheets/new_user.css