Merging in style changes