Custom and Man. SKU get along now

Custom SKU and Manufacturer SKU have their own columns so there aren’t
any struggles between them when both are enabled