Updated test.txt
removing conflicts