Update confilt.txt

log for conflit