minor inventory commits
fixed inventory and porderdetails merge conflicts