code style
merge