Added an conflicting line to testfile.txt