make some changes to test.txt
resolve conficts and fixed count
Merge pull request #2 from Stanislavs-Organization/merge-conflict

 make some changes to test.txt