Update README.txt
fixed conflicts