1 files changed, 1 insertions, 13 deletions
diff --git a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
index 587efd6ed41..6e1e6f5c2d0 100644
--- a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
+++ b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlButton, GlAlert, GlModalDirective } from '@gitlab/ui';
-import { CENTERED_LIMITED_CONTAINER_CLASSES } from '../constants';
 
 export default {
   components: {
@@ -11,10 +10,6 @@ export default {
     GlModalDirective,
   },
   props: {
-    limited: {
-      type: Boolean,
-      required: true,
-    },
     mergeable: {
       type: Boolean,
       required: true,
@@ -24,18 +19,11 @@ export default {
       required: true,
     },
   },
-  computed: {
-    containerClasses() {
-      return {
-        [CENTERED_LIMITED_CONTAINER_CLASSES]: this.limited,
-      };
-    },
-  },
 };
 </script>
 
 <template>
-  <div :class="containerClasses">
+  <div>
     <gl-alert
       :dismissible="false"
       :title="__('There are merge conflicts')"