Fix a merge error in ComponentSelector, which should get Travis passing again.