fix minor bugs
fix conflict