[ci skip] Fix conflicts

app/assets/javascripts/ide/index.js

 import Vue from 'vue';
-import { mapActions } from 'vuex';
-import { convertPermissionToBoolean } from '../lib/utils/common_utils';
 import ide from './components/ide.vue';
-
 import store from './stores';
 import router from './ide_router';
 import Translate from '../vue_shared/translate';
-import ContextualSidebar from '../contextual_sidebar';
 
 function initIde(el) {
   if (!el) return null;
@@ -18,30 +14,13 @@ function initIde(el) {
     components: {
       ide,
     },
-    created() {
-      const data = el.dataset;
-
-      this.setInitialData({
-        endpoints: {
-          rootEndpoint: data.url,
-          newMergeRequestUrl: data.newMergeRequestUrl,
-          rootUrl: data.rootUrl,
+    render(createElement) {
+      return createElement('ide', {
+        props: {
+          emptyStateSvgPath: el.dataset.emptyStateSvgPath,
         },
-        canCommit: convertPermissionToBoolean(data.canCommit),
-        onTopOfBranch: convertPermissionToBoolean(data.onTopOfBranch),
-        path: data.currentPath,
-        isRoot: convertPermissionToBoolean(data.root),
-        isInitialRoot: convertPermissionToBoolean(data.root),
       });
     },
-    methods: {
-      ...mapActions([
-        'setInitialData',
-      ]),
-    },
-    render(createElement) {
-      return createElement('ide');
-    },
   });
 }
 
@@ -50,6 +29,3 @@ const ideElement = document.getElementById('ide');
 Vue.use(Translate);
 
 initIde(ideElement);
-
-const contextualSidebar = new ContextualSidebar();
-contextualSidebar.bindEvents();