Update blacksmith.txt

resolved merge conflict in blacksmith.txt