remove conflict marker. oops.
move sfu course form button to dashboard_sidebar.html.erb as per new world order