Fixed conflicts in testfile1.txt