changes to readme.txt file , testing merge conflict in phpstorm