fix merge bug
fix merge bug