fix merge issue in previous