add a new Line
readme.txt
conflict fixed