added character_inventory_item table and added tests
fixing merge conflict