inventory
update fix merge conflicts