fix some bugs
solve conflicts