update njajal1.txt

testing conflict case