Update taekwon.txt

resolved merge conflict in taekwon.txt