some style
fix conflict