Merge pull request #25485 from georgemillo/patch-1

English fix

actionview/CHANGELOG.md

@@ -18,7 +18,7 @@
     *Eileen M. Uchitelle*
 
 *   `select_tag`'s `include_blank` option for generation for blank option tag, now adds an empty space label,
-     when the value as well as content for option tag are empty, so that we confirm with html specification.
+     when the value as well as content for option tag are empty, so that we conform with html specification.
      Ref: https://www.w3.org/TR/html5/forms.html#the-option-element.
 
     Generation of option before: