TIB-124 modified file test2.txt
TIB-124 Resolved the conflicts for file Test2.txt