fix merge artifacts