modify new1.txt
resolved conflicts