Resolve conflicts in app/views/layouts/header/_help_dropdown.html.haml

app/views/layouts/header/_help_dropdown.html.haml

@@ -4,8 +4,5 @@
       = link_to _("Help"), help_path
   - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
     = render 'shared/user_dropdown_contributing_link'
-<<<<<<< HEAD
   - if instance_review_permitted?
     = render 'shared/user_dropdown_instance_review'
-=======
->>>>>>> upstream/master