fix next merge issue