Partial Cartels and Mergers with Heterogeneous Firms