fix some bugs
fix some conflict