fixing style of previous merge