More merge fixes... Customers and Products working