Update assassin.txt

resolved merge conflict in assassin.txt