Conditioner and after-shampoo treatments