Fix hard coded plural text.

app/assets/javascripts/merge_conflict_data_provider.js.es6

@@ -39,6 +39,9 @@ class MergeConflictDataProvider {
 
     vueInstance.conflictsData = data;
     vueInstance.isSubmitting = false;
+
+    const conflictsText = this.getConflictsCount() > 1 ? 'conflicts' : 'conflict';
+    vueInstance.conflictsData.conflictsText = conflictsText;
   }
 
 
@@ -101,7 +104,6 @@ class MergeConflictDataProvider {
       }
 
     });
-
   }
 
 

app/views/projects/merge_requests/conflicts/_commit_stats.html.haml

@@ -13,7 +13,7 @@
   .js-toggle-container
     .commit-stat-summary
       Showing
-      %strong.cred {{conflictsCount}} conflicts
+      %strong.cred {{conflictsCount}} {{conflictsData.conflictsText}}
       between
       %strong {{conflictsData.source_branch}}
       and