fix bugs
 fix conflict