1 files changed, 10 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
index 8e1b18c63a4..a5d982fe221 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
@@ -88,25 +88,24 @@ export default {
     </template>
     <template v-if="!isLoading && !state.shouldBeRebased" #actions>
       <gl-button
-        v-if="userPermissions.canMerge"
+        v-if="showResolveButton"
+        :href="mr.conflictResolutionPath"
         size="small"
         variant="confirm"
-        category="secondary"
-        data-testid="merge-locally-button"
-        class="js-check-out-modal-trigger gl-align-self-start"
-        :class="{ 'gl-mr-2': showResolveButton }"
+        class="gl-align-self-start"
+        data-testid="resolve-conflicts-button"
       >
-        {{ s__('mrWidget|Resolve locally') }}
+        {{ s__('mrWidget|Resolve conflicts') }}
       </gl-button>
       <gl-button
-        v-if="showResolveButton"
-        :href="mr.conflictResolutionPath"
+        v-if="userPermissions.canMerge"
         size="small"
         variant="confirm"
-        class="gl-mb-2 gl-md-mb-0 gl-align-self-start"
-        data-testid="resolve-conflicts-button"
+        category="secondary"
+        data-testid="merge-locally-button"
+        class="js-check-out-modal-trigger gl-align-self-start"
       >
-        {{ s__('mrWidget|Resolve conflicts') }}
+        {{ s__('mrWidget|Resolve locally') }}
       </gl-button>
     </template>
   </state-container>