change text3.tx
git conflict resolved