updated shop
fixing merge conflicts