Inventory view of Vendor hub
fix conflicts