ATIB-123 added test.txt
ATIB-123 modified readme.md
ATIB-123 modified test.txt by dev1
ATIB-123 test.txt modified by dev2
ATIB-123 conflict resolved