Update testconflic.txt