fix bugs
fix merge conflicts