fix some bug
solve confict