San Francisco’s Planning Code section 317 which denied housing unit mergers for ten years after an apartment owner had withdrawn one of the units to be merged from the rental market conflicted with the Ellis Bill (Gov. Code 7060.2) by penalizing conduct (withdrawing a unit from the rental market) that the Ellis Bill specifically permits.