same conflict fix in styles