fix styling of previous merge