Update gunslinger.txt

resolved merge conflict in gunslinger.txt