style
merged