merge fix for inventory syntax error