change style
merge