modifying file README.txt in ta2
merged conflicted file