Update haiku.txt

adding a conflct line