Update novice.txt

resolved merge conflict in novice.txt