Resolve conflicts

app/assets/javascripts/dispatcher.js

@@ -416,13 +416,10 @@ import AuditLogs from './audit_logs';
           new AuditLogs();
           break;
         case 'projects:settings:repository:show':
-<<<<<<< HEAD
           // Initialize Protected Branch Settings
           new gl.ProtectedBranchCreate();
           new gl.ProtectedBranchEditList();
           new UsersSelect();
-=======
->>>>>>> upstream/master
           // Initialize expandable settings panels
           initSettingsPanels();
           break;

app/assets/stylesheets/pages/projects.scss

@@ -766,16 +766,12 @@ a.allowed-to-push {
   }
 }
 
-<<<<<<< HEAD
 .disabled-item {
   @extend .btn.disabled;
 }
 
-.protected-tags-list {
-=======
 .protected-tags-list,
 .protected-branches-list {
->>>>>>> upstream/master
   .dropdown-menu-toggle {
     width: 100%;
     max-width: 300px;

config/webpack.config.js

@@ -59,12 +59,8 @@ var config = {
     pipelines_details:     './pipelines/pipeline_details_bundle.js',
     profile:              './profile/profile_bundle.js',
     prometheus_metrics:   './prometheus_metrics',
-<<<<<<< HEAD
-    protected_branches:   './protected_branches/protected_branches_bundle.js',
-    ee_protected_branches: './protected_branches/ee/protected_branches_bundle.js',
-=======
     protected_branches:   './protected_branches',
->>>>>>> upstream/master
+    ee_protected_branches: './protected_branches/ee/protected_branches_bundle.js',
     protected_tags:       './protected_tags',
     ee_protected_tags:    './protected_tags/ee',
     service_desk:         './projects/settings_service_desk/service_desk_bundle.js',