Update testconflict.txt