adding changes to test.txt
merging changes