Update crusader.txt

resolved merge conflict in crusader.txt