fix bugs
fix conflict