fix merge bug.