fixed shop
merge conflict