Update ninja.txt

resolved merge conflict in ninja.txt