Merge branch 'fix-conflict-pluralized' into 'master'

FIX #35027 : conflict pluralized

Closes #35027

See merge request !13051

app/assets/javascripts/merge_conflicts/merge_conflict_store.js

@@ -175,7 +175,7 @@ import Cookies from 'js-cookie';
 
     getConflictsCountText() {
       const count = this.getConflictsCount();
-      const text = count ? 'conflicts' : 'conflict';
+      const text = count > 1 ? 'conflicts' : 'conflict';
 
       return `${count} ${text}`;
     },