fix merge log