modified rainbowDasher.txt and nonononon.txt
Conflict resolved :)