Update tha_t.txt

resolved merge conflict in tha_t.txt