update style
merge conflicts