Inventory Charge Merge Fix

Resolves #594