changes some style
merged