Shop screen and inventory
manual merge