fix some bugs
fix conflict
fix some bugs