Changes to inventory
Static player
merge