# Conflicts: # app/controllers/subjects_controller.rb # public/react/src/App.js # public/react/src/modules/courses/coursesPublic/Addcourses.js # public/react/src/modules/modals/Certifiedprofessional.js # public/react/src/modules/modals/certfed.css