more inventory work
fix for merge conflict