Resolve conflicts in app/views/dashboard/merge_requests.html.haml

app/views/dashboard/merge_requests.html.haml

 - @hide_top_links = true
 - page_title _("Merge Requests")
 - @breadcrumb_link = merge_requests_dashboard_path(assignee_username: current_user.username)
-<<<<<<< HEAD
 
 = render_if_exists "shared/gold_trial_callout"
-=======
->>>>>>> upstream/master
 
 .page-title-holder
   %h1.page-title= _('Merge Requests')