fix bugs
fix conflicts