fix merge bug