recent changes to style
merged