updated the style
merge conflict
test
merge conflicts