Fixing conflict in the InventoryList due to refactoring of the AutoPart.  Merge failed again