Modified test.txt file
Modified test.txt file for the 2nd time
Fixed conflict