Update testOne.txt

add some text to test merge problems