Update bard.txt

resolved merge conflict in bard.txt