Update lalari.txt

make conflict