Add NewThree.txt
Add NewOne.txt
conflict NewOne.txt solve
Modify NewOne.txt