fix bug
fix conflict