added test.txt
fixed merge issue