Update supernovice.txt

resolved merge conflict in supernovice.txt