changed conflictfile.txt