fix style
merge