Update guildcastles.txt

resolved merge conflict in guildcastles.txt