Fix conflicts on spec/features/protected_branches_spec.rb

app/assets/javascripts/protected_branches/protected_branch_create.js.es6

@@ -51,7 +51,7 @@
       });
 
       // Protected branch dropdown
-      new gl.ProtectedBranchDropdown({
+      new window.ProtectedBranchDropdown({
         $dropdown: this.$wrap.find('.js-protected-branch-select'),
         onSelect: this.onSelectCallback
       });

app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6

-/* eslint-disable */
-(global => {
-  global.gl = global.gl || {};
+/* eslint-disable comma-dangle, no-unused-vars */
 
-  class ProtectedBranchDropdown {
+class ProtectedBranchDropdown {
   constructor(options) {
     this.onSelect = options.onSelect;
     this.$dropdown = options.$dropdown;
@@ -77,13 +75,6 @@
 
     this.$dropdownFooter.toggleClass('hidden', !branchName);
   }
-  }
-<<<<<<< HEAD
-
-  global.gl.ProtectedBranchDropdown = ProtectedBranchDropdown;
-})(window);
-=======
 }
 
 window.ProtectedBranchDropdown = ProtectedBranchDropdown;
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c