more style
fix merge conflict