fix code style
fix merge conflicts