update shop_struct
merge
update