added subsets
fix merge