update style
merge upstream