updated inventory function, items can get combined now
 Please enter the commit message for your changes. Lines starting