Fix conflicts

app/views/shared/milestones/_sidebar.html.haml

@@ -92,13 +92,9 @@
         // Fallback while content is loading
         .title.hide-collapsed
           = _('Time tracking')
-<<<<<<< HEAD
-          = icon('spinner spin', 'aria-hidden': 'true')
+          = icon('spinner spin')
 
     = render 'shared/milestones/weight', milestone: milestone
-=======
-          = icon('spinner spin')
->>>>>>> upstream/master
 
     .block.merge-requests
       .sidebar-collapsed-icon

config/webpack.config.js

@@ -91,10 +91,7 @@ var config = {
     service_desk:         './projects/settings_service_desk/service_desk_bundle.js',
     service_desk_issues:  './service_desk_issues/index.js',
     registry_list:        './registry/index.js',
-<<<<<<< HEAD
     roadmap:              'ee/roadmap',
-=======
->>>>>>> upstream/master
     ide:                  './ide/index.js',
     sidebar:              './sidebar/sidebar_bundle.js',
     ee_sidebar:           'ee/sidebar/sidebar_bundle.js',