Update wizard.txt

resolved merge conflict in wizard.txt