Merge inventory

There aren't any items yet, so I haven't fully tested the merge, but it seems like it should work.