Modified test.txt
Fixed conflict