add shop
fix shop
oops
merge conflicts