Fixing Merge of item_db split