Update test.txt

conflict