added test.txt
fixed conflict