text1.txt modified
text1.txt conflict solved