small style
merge