slove conflit
merge NewOne.txt