Update shops.txt

resolved merge conflict in shops.txt