Update dancer.txt

resolved merge conflict in dancer.txt