X-100 surfactant in conditioners