Modify NewOne.txt
slove conflit