Conflicts: app/views/blog_comments/show.html.erb app/views/courses/syllabus.html.erb app/views/messages/_org_subfield_show.html.erb
Conflicts: app/views/users/_course_journalsformessage.html.erb