modify style
merge