fix merge
fix merge
fix bpass,chekin