Add inventory
Fix merge conflict