style
merge