basic inventory code
resolved merge conflicts