Hair conditioning composition

A hair care composition obtained by blending a conditioning gel phase with an aqueous emulsion of a non-linear organopolysiloxane comprising monomer units of silsesquioxane having a formula (RSiO3/2)n

• where n=1, and
• R is an alkyl group, and copolymer segments of polydialkylsiloxane;
• the conditioning gel phase being formed from a cationic surfactant, a 25° C. or higher melting point fatty compound and an aqueous carrier;
• and wherein the aqueous emulsion of the non-linear organopolysiloxane has an aqueous continuous phase consisting of water and a blend of non-ionic and cationic surfactants, and a dispersed phase consisting of the non-linear organopolysiloxane and a hydrocarbon oil, wherein the weight ratio of the non-linear organopolysiloxane to the hydrocarbon oil is 40:60 to 65:35, the hair care composition conditions hair after shampooing and further wherein the non-linear organosiloxane and hydrocarbon oil make up from 0.05 to 3.5% by weight of the hair care composition, the cationic surfactant to fatty compound present at a weight ratio from 1:1 to 1:10 and the fatty compound makes up from 0.01 to 10% by weight of the hair care composition.