shop interface is now ready, it just needs items to sell
fix merge