Update confilt.txt

test for conflict