fix merge artifact