Fixes #1 review and updated test.txt
[hotfix] do not add more conflicts
conflicts resolved