another changes made in text.txt
conflict fixed in text.txt