AND simple
& simple
conflict fixed
===
***
 readme.txt