Update cashshop_db.conf

resolved merge conflict in cashshop_db.conf