fix merge

Author: nicolas-grekas

Tests/Inflector/EnglishInflectorTest.php

@@ -79,6 +79,7 @@ public function singularizeProvider()
             ['focuses', ['focus', 'focuse', 'focusis']],
             ['formulae', 'formula'],
             ['formulas', 'formula'],
+            ['conspectuses', 'conspectus'],
             ['fungi', 'fungus'],
             ['funguses', ['fungus', 'funguse', 'fungusis']],
             ['garages', ['garag', 'garage']],
@@ -220,6 +221,7 @@ public function pluralizeProvider()
             ['focus', 'focuses'],
             ['foot', 'feet'],
             ['formula', 'formulas'], //formulae
+            ['conspectus', 'conspectuses'],
             ['fungus', 'fungi'],
             ['garage', 'garages'],
             ['goose', 'geese'],