fix bugs
fix merge bugs