Modified test.txt
Added to test.txt
Fixed conflict