Added inventory
merging
Fixed problems with ResumeButton
inventory