text1.txt updated
 text1.txt conflict resolved