fixed label subscription & merge conflicts

app/assets/javascripts/dispatcher.js

@@ -263,7 +263,6 @@ import initIssuableSidebar from './init_issuable_sidebar';
           new ZenMode();
           new gl.GLForm($('.release-form'), true);
           break;
-        case 'projects:merge_requests:conflicts:show':
         case 'projects:merge_requests:show':
           new gl.Diff();
           shortcut_handler = new ShortcutsIssuable(true);
@@ -381,7 +380,15 @@ import initIssuableSidebar from './init_issuable_sidebar';
           if ($('.prioritized-labels').length) {
             new gl.LabelManager();
           }
-          new gl.ProjectLabelSubscription('.label-subscription');
+          $('.label-subscription').each((i, el) => {
+            const $el = $(el);
+
+            if ($el.find('.dropdown-group-label').length) {
+              new gl.GroupLabelSubscription($el);
+            } else {
+              new gl.ProjectLabelSubscription($el);
+            }
+          });
           break;
         case 'projects:network:show':
           // Ensure we don't create a particular shortcut handler here. This is

app/assets/javascripts/init_legacy_filters.js

 /* eslint-disable no-new */
-/* global UsersSelect */
 /* global LabelsSelect */
 /* global MilestoneSelect */
 /* global IssueStatusSelect */
 /* global SubscriptionSelect */
 
+import UsersSelect from './users_select';
+
 export default () => {
   new UsersSelect();
   new LabelsSelect();

app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js

@@ -2,6 +2,7 @@
 /* global Flash */
 
 import Vue from 'vue';
+import initIssuableSidebar from '../init_issuable_sidebar';
 import './merge_conflict_store';
 import './merge_conflict_service';
 import './mixins/line_conflict_utils';
@@ -19,6 +20,8 @@ $(() => {
     resolveConflictsPath: conflictsEl.dataset.resolveConflictsPath
   });
 
+  initIssuableSidebar();
+
   gl.MergeConflictsResolverApp = new Vue({
     el: '#conflicts',
     data: mergeConflictsStore.state,