Resolve conflict in outdated browser banner

app/views/shared/_outdated_browser.html.haml

 - if outdated_browser?
-<<<<<<< HEAD
-  .browser-alert
-    GitLab may not work properly because you are using an outdated web browser.
-    %br
-    Please install a
-    = link_to 'supported web browser', help_page_path('install/requirements', anchor: 'supported-web-browsers')
-    for a better experience.
-=======
   .flash-container
     .flash-alert.text-center
       GitLab may not work properly because you are using an outdated web browser.
@@ -14,4 +6,3 @@
       Please install a
       = link_to 'supported web browser', help_page_path('install/requirements', anchor: 'supported-web-browsers')
       for a better experience.
->>>>>>> upstream/master