Update nightmare.txt

resolved merge conflict in nightmare.txt