fix before pull
fix merge error
fix bugs