fix merge wrong