Phonetics supporting NYSIIS encoding.

README.md

@@ -1,15 +1,12 @@
 # Linguistics
 
-<<<<<<< HEAD
-**NEW -->** Support to  NYSIIS encoding
-**What's next? -->** Support to Caverphone, Arpabet
 
-=======
 [![Codacy Security Scan](https://github.com/carloswph/linguistics/actions/workflows/codacy-analysis.yml/badge.svg)](https://github.com/carloswph/linguistics/actions/workflows/codacy-analysis.yml)
 [![License](https://img.shields.io/packagist/l/carloswph/linguistics.svg)](https://packagist.org/packages/carloswph/linguistics)
 
+**NEW -->** Support to  NYSIIS encoding
+**What's next? -->** Support to Caverphone, Arpabet
 
->>>>>>> 8af39671f710b41fed59520dc8dacdc44a16c2c3
 This package aims to provide a comprehensive group of new functions and methods to deal with linguistics and phonetics algorithms commonly used for developing or information technology. While PHP already offers functions to encode strings in metaphone and soundex algorithms, some other useful algorithms can't be reached from native functions.
 
 Also, this package brings a dictionary to provide immediate conversion from almost any English word, from text to IPA phonetic symbols. For this moment, just en_US is available, but there are plans to include other languages or dialects eventually.