added coinsShop
added coinsShop to work
adding cropShop
fixed merge conflict