1 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
index 9dcde3e4f33..7a92484695c 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
@@ -19,7 +19,7 @@ describe('MRWidgetConflicts', () => {
   const userCannotMergeText =
     'Users who can write to the source or target branches can resolve the conflicts.';
   const resolveConflictsBtnText = 'Resolve conflicts';
-  const mergeLocallyBtnText = 'Merge locally';
+  const mergeLocallyBtnText = 'Resolve locally';
 
   async function createComponent(propsData = {}) {
     wrapper = extendedWrapper(
@@ -224,8 +224,8 @@ describe('MRWidgetConflicts', () => {
           });
         });
 
-        it('should not allow you to resolve the conflicts', () => {
-          expect(findResolveButton().exists()).toBe(false);
+        it('should allow you to resolve the conflicts', () => {
+          expect(findResolveButton().exists()).toBe(true);
         });
       });